--- Day changed Mon May 18 2020 01:16 -!- AlineEnigma [c8c3a2f2@gateway/web/cgi-irc/kiwiirc.com/ip.200.195.162.242] has joined #bitcoin-core-pr-reviews 01:19 -!- AlineEnigma [c8c3a2f2@gateway/web/cgi-irc/kiwiirc.com/ip.200.195.162.242] has quit [Client Quit] 02:32 -!- belcher [~belcher@unaffiliated/belcher] has joined #bitcoin-core-pr-reviews 03:13 -!- Orie18Hansen [~Orie18Han@static.57.1.216.95.clients.your-server.de] has joined #bitcoin-core-pr-reviews 03:18 -!- Orie18Hansen [~Orie18Han@static.57.1.216.95.clients.your-server.de] has quit [Ping timeout: 256 seconds] 03:56 -!- sr_gi_ [~sr_gi@183.red-83-34-186.dynamicip.rima-tde.net] has joined #bitcoin-core-pr-reviews 03:58 -!- sr_gi [~sr_gi@183.red-83-34-186.dynamicip.rima-tde.net] has quit [Ping timeout: 265 seconds] 04:16 -!- sr_gi_ [~sr_gi@183.red-83-34-186.dynamicip.rima-tde.net] has quit [Read error: Connection reset by peer] 04:16 -!- sr_gi [~sr_gi@183.red-83-34-186.dynamicip.rima-tde.net] has joined #bitcoin-core-pr-reviews 05:39 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 05:40 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Client Quit] 05:40 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 08:16 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Quit: leaving] 08:26 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 08:27 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Client Quit] 08:27 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 08:27 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Client Quit] 08:30 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 08:35 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Quit: leaving] 08:35 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 08:44 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Quit: leaving] 08:44 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 09:20 -!- vasild_ [~vd@gateway/tor-sasl/vasild] has joined #bitcoin-core-pr-reviews 09:23 -!- vasild [~vd@gateway/tor-sasl/vasild] has quit [Ping timeout: 240 seconds] 09:23 -!- vasild_ is now known as vasild 10:53 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Ping timeout: 265 seconds] 12:14 -!- Talkless [~Talkless@hst-227-49.splius.lt] has quit [Quit: Konversation terminated!] 12:29 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 12:33 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Ping timeout: 260 seconds] 12:40 -!- dfmb_ [~dfmb_@unaffiliated/dfmb/x-4009105] has quit [Quit: Leaving] 12:45 -!- kristapsk_ [~KK@gateway/tor-sasl/kristapsk] has quit [Remote host closed the connection] 12:57 < pinheadmz> question for the git-wizards. I have a branch thats like 20 commits, but the last 8 or so are fixups. I would love to squash them, but its hard to determine for each of those fixups which "original" commit I need to squash in to. 12:57 < pinheadmz> I guess what i need is, for a fixup commit, for some tool to tell me, which commit originally changed each line 12:58 < gwillen> if you want to know which commit previously changed a specific line, you can do it with 'git blame', but I think that doesn't really solve your problem 12:58 < gwillen> since a fixup doesn't necessarily touch a line that was touched in the commit it's fixing, it could be merely a related line 12:58 < gwillen> I think you're better off doing it by hand 12:58 < gwillen> (or noting when making the fixup, what it's fixing up) 12:59 < pinheadmz> yeah if I blame, ill just see the fix up commit. 12:59 < gwillen> well you can do git blame starting before the fixups 12:59 < pinheadmz> yeah i was lazy when fixing up 12:59 < pinheadmz> like, rebase -i with `edit` to the fixup then gitblame on the head 13:00 < gwillen> that would work, or you can just 'checkout' the commit before the fixup, or I was hoping there was a nicer way to do this 13:01 < gwillen> you can use blame --ignore-rev and a given commit, to just ignore a single commit 13:01 < gwillen> or a small list of commits 13:02 < pinheadmz> ignore-rev!!!!! dude thank you this looks like a solid lead 13:02 < gwillen> excellent np :-) 13:02 < sipa> i often just continuously rebase, move fixup commits up one by one as long as the rebase succeeds 13:02 < pinheadmz> i think git may be my favorite computer program, full stop. 13:03 < pinheadmz> its been contirbuted by so many developers, it just has everything 13:03 < sipa> the stockholm is strong with this one 13:03 < pinheadmz> ha! 13:03 < pinheadmz> perhaps 13:03 < gwillen> hahaha 13:03 < sipa> (with me, fwiw) 13:03 < pinheadmz> would love yo hear your pet peeves with it in that case 13:03 < sipa> (with me too, fwiw) 13:03 < pinheadmz> oh i c 13:04 < sipa> my worst is that during a rebase, it's hard to distinguish between "i stopped here because the user requested an edit" or "because there is a conflict", and in case of the latter if you dare to use git commit --amend (as you'd do with the other one after fixing things us), you lose a commit 13:05 < pinheadmz> oh huh 13:05 < pinheadmz> git status would tell you which right? 13:05 < sipa> i've learned to always run git status, yeah 13:05 < sipa> but still... muscle memory sometimes makes me type git commit -a --amend 13:05 < gwillen> I run status compulsively 13:05 < gwillen> before and after pretty much every operation 13:06 < pinheadmz> me too 13:34 -!- kristapsk [~KK@gateway/tor-sasl/kristapsk] has joined #bitcoin-core-pr-reviews 14:04 -!- kristapsk [~KK@gateway/tor-sasl/kristapsk] has quit [Remote host closed the connection] 14:10 -!- illlicit_ [uid109953@gateway/web/irccloud.com/x-kkzirplxskyqfltc] has joined #bitcoin-core-pr-reviews 14:13 -!- kristapsk [~KK@gateway/tor-sasl/kristapsk] has joined #bitcoin-core-pr-reviews 14:28 < jb55> pinheadmz: try git-autofixup or git-absorb 14:29 < jb55> results may vary depending on how logically clean your commit history is 14:31 -!- slivera [~slivera@116.206.230.100] has joined #bitcoin-core-pr-reviews 14:37 < pinheadmz> oooh these are cool commands thank you 14:38 < pinheadmz> did you mean autosquash actaully? or is autofixup liek a plugin? dont see it in usual place for git docs 14:38 < pinheadmz> ? https://github.com/tummychow/git-absorb 14:38 < pinheadmz> kinda neat 14:44 -!- shesek [~shesek@unaffiliated/shesek] has quit [Ping timeout: 264 seconds] 14:47 -!- shesek [~shesek@185.3.145.28] has joined #bitcoin-core-pr-reviews 14:47 -!- shesek [~shesek@185.3.145.28] has quit [Changing host] 14:47 -!- shesek [~shesek@unaffiliated/shesek] has joined #bitcoin-core-pr-reviews 14:54 -!- shesek [~shesek@unaffiliated/shesek] has quit [Ping timeout: 264 seconds] 14:55 -!- shesek [~shesek@185.3.145.28] has joined #bitcoin-core-pr-reviews 14:55 -!- shesek [~shesek@185.3.145.28] has quit [Changing host] 14:55 -!- shesek [~shesek@unaffiliated/shesek] has joined #bitcoin-core-pr-reviews 14:59 -!- shesek [~shesek@unaffiliated/shesek] has quit [Ping timeout: 265 seconds] 15:00 < jb55> yeah they try to figure out the right commit to fixup based on git blame 15:00 < jb55> ~automagically~ 15:04 -!- shesek [~shesek@185.3.145.28] has joined #bitcoin-core-pr-reviews 15:04 -!- shesek [~shesek@185.3.145.28] has quit [Changing host] 15:04 -!- shesek [~shesek@unaffiliated/shesek] has joined #bitcoin-core-pr-reviews 15:28 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has joined #bitcoin-core-pr-reviews 15:34 -!- pinheadmz [~pinheadmz@pool-100-33-69-78.nycmny.fios.verizon.net] has quit [Remote host closed the connection] 15:34 -!- pinheadmz [~pinheadmz@pool-100-33-69-78.nycmny.fios.verizon.net] has joined #bitcoin-core-pr-reviews 15:35 -!- troygiorshev [~troygiors@CPEdcef09a0ed55-CM0c473d74be00.cpe.net.cable.rogers.com] has quit [Ping timeout: 256 seconds] 16:26 -!- vasild [~vd@gateway/tor-sasl/vasild] has quit [Ping timeout: 240 seconds] 16:26 -!- vasild [~vd@gateway/tor-sasl/vasild] has joined #bitcoin-core-pr-reviews 16:31 < gwillen> huh wow, that's neat and also I'm surprised it works 16:34 < MarcoFalke> I wouldn't necessarily trust that to do the right thing 16:35 < MarcoFalke> Oh, looks like it is only appending commits and not changing existing ones unless you ask for it 16:35 < MarcoFalke> Well, not too bad I guess 17:30 -!- mol [~mol@unaffiliated/molly] has quit [Ping timeout: 256 seconds] 17:58 -!- mol [~mol@unaffiliated/molly] has joined #bitcoin-core-pr-reviews 21:20 -!- vasild_ [~vd@gateway/tor-sasl/vasild] has joined #bitcoin-core-pr-reviews 21:23 -!- vasild [~vd@gateway/tor-sasl/vasild] has quit [Ping timeout: 240 seconds] 21:23 -!- vasild_ is now known as vasild 22:12 -!- Talkless [~Talkless@hst-227-49.splius.lt] has joined #bitcoin-core-pr-reviews 23:19 -!- kristapsk [~KK@gateway/tor-sasl/kristapsk] has quit [Remote host closed the connection]