Паб Красный лев

02[16:11] * canton7_laptop (~canton7@95.150.40.138) Quit (Ping timeout: 260 seconds)

03[16:12] * shirt (~vip@adsl-v01-3db14831dc15da1b.tau.ac.il) has joined #git

03[16:13] * tdebat (~tdebat@fwnat.oicr.on.ca) has joined #git

03[16:13] * teknoid (~teknoid@66-55-176-186.ds1-static.mia1.net.ststelecom.com) has joined #git

[16:13] Hi, where can I find a git repository that has version 1.7.6.3?

03[16:13] * dcarper (~dcarper@50-73-187-102-pennsylvania.hfc.comcastbusiness.net) has joined #git

02[16:13] * bigkm (~bigkm@123-243-191-137.static.tpgi.com.au) Quit (Quit: Computer has gone to sleep.)

03[16:14] * teweWork (~tewe@mail.appello.hu) has joined #git

[16:14] rudi_s: Uh, the one that’s linked from the release announcement?

03[16:15] * Spockz (~Spockz@21pc198.sshunet.nl) has joined #git

02[16:15] * bloony (~lterje@cm-84.215.149.163.getinternet.no) Quit (Remote host closed the connection)

03[16:15] * w09x (~w09x@ppp121-44-232-127.lns20.syd7.internode.on.net) has joined #git

03[16:15] * catsup (~d@ps38852.dreamhost.com) has joined #git

[16:15] FauxFaux: Well, on the website (git-scm.com) there’s no 1.7.6.3, and git.kernel.org (the linked git repository) is still down.

02[16:16] * macmaN (~chezburge@138.167.190.90.dyn.estpak.ee) Quit (Read error: Connection reset by peer)

03[16:16] * dvaske (asolsson@nat/nokia/x-crxxdwwhdzhbyzvx) has joined #git

[16:17] rudi_s: So how did you find out about 1.7.6.3? Topic, perhaps? Cheating. Well, it’s trivial to google.

03[16:18] * Spyro is now known as Spyro-rec

[16:18] FauxFaux: Yeah. /topic.

02[16:18] * w09x (~w09x@ppp121-44-232-127.lns20.syd7.internode.on.net) Quit (Remote host closed the connection)

[16:19] Ok so I’m kind of lost on how I merge two commits with rebase.

03[16:19] * notbrent (~notbrent@186.85.88.56) has joined #git

[16:19] FauxFaux: Ah, thank you – that was too easy, didn’t think of searching for 1.7.6.3. Sorry for the nouse.

03[16:19] * macmaN_ (~chezburge@138.167.190.90.dyn.estpak.ee) has joined #git

03[16:20] * mfilipe (~michel@mfilipe.eti.br) has left #git («Ex-Chat»)

03[16:20] * andrewpthorp (~andrewpth@75-145-199-54-Richmond.hfc.comcastbusiness.net) has joined #git

[16:20] andrewvos: merge and rebase are different things. merge joins two branches, rebase puts the commits on one branch after another creating a linear history.

[16:20] rudi_s: Sorry I don’t mean that type of merge.

[16:21] rudi_s: I’ve got two commits and I want them to be one.

03[16:21] * bigkm (~bigkm@123-243-191-137.static.tpgi.com.au) has joined #git

[16:22] andrewvos: Oh, git rebase -i sha-of-older-commit~ and then squash them.

02[16:22] * jmcantrell (u324@gateway/web/irccloud.com/x-ovuigbzsnaydlnbl) Quit (Max SendQ exceeded)

03[16:22] * jmcantrell (u324@gateway/web/irccloud.com/x-ayjqhxwirlvobgjo) has joined #git

02[16:22] * miguet (~miguet@121.1.54.50) Quit (Ping timeout: 260 seconds)

02[16:22] * kermit (unknown@pdpc/supporter/bronze/kermit) Quit (Quit: Leaving.)

03[16:23] * kermit (unknown@pdpc/supporter/bronze/kermit) has joined #git

02[16:23] * cooloney (~roc@180.157.83.211) Quit (Quit: leaving)

03[16:23] * rideh (~rideh@99-8-16-147.lightspeed.iplsin.sbcglobal.net) has joined #git

02[16:23] * f0i (~f0i@116.110.139.4) Quit (Max SendQ exceeded)

02[16:25] * teknoid (~teknoid@66-55-176-186.ds1-static.mia1.net.ststelecom.com) Quit (Quit: Leaving)

[16:25] rudi_s: Interesting I’ve never done an interactive rebase..

03[16:25] * ReekenX (~remigijus@lan-78-157-94-102.vln.skynet.lt) has joined #git

[16:26] why doesn’t git commit –amend do –reset-author by default? seems like the sensible thing

[16:26] They are very useful from time to time (as long as you don’t rebase any public commits).

03[16:26] * kylehayes (~kylehayes@12.192.106.104) has joined #git

03[16:27] * Targen (~iguana@159.90.15.21) has joined #git

[16:27] rudi_s: Ok so I’ve got commits 1,2,3,4 and I want to squash 1,3,4 into one. Is this possible? Could you point me in the direction of some docs that could explain this a bit better?

[16:27] rudi_s: Yeah I’ve made sure not to push anything to any public repo.

03[16:27] * tpiep (~tpiep@c-68-53-83-118.hsd1.tn.comcast.net) has joined #git

[16:27] andrewvos: Sure. git rebase -i … and then move 2 above (or below) 1,3,4 and then squash the rest.

[16:28] !book

[16:28] *automatic message* ‘Pro Git’ is a complete book about git that is available online for free: http://progit.org/book/

[16:28] andrewvos: Have a look at the man page and progit ^ also describes it in detail.

02[16:28] * gnufied (~gnufied@122.172.243.212) Quit (Quit: Leaving.)

[16:28] (Chapter 3.6.)

02[16:29] * Deesl (~bsdboy@un

Комментарии запрещены.