[00:45:41] Reedy: Sorry, I've seen your comments when I was just about to push that new patchset with complete form pre-fill and range-checking (and even ooui :) ). If you'd prefer me to revert it and move the edit link stuff into a follow up just say so and I'll do that. That half-baked state definitely was shit, I agree :D [00:47:00] Depends how much credit you want to take for your work ;) [00:47:50] Like I say, if we kept Glashiers patch as is... [00:47:59] Yeah, it's not finished, but it's semi complete... I think [00:50:24] I don't care at all ;) [00:54:01] Actually, if you don't care, I'd go with keeping it all in one, saves me the work of splitting it up. Although I've heard git has some great tools for that which I should maybe figure out anyway sooner or later. [00:55:54] If you mean "git rebase -i master", The phrase "great" is a significant overstatement ;) [00:58:32] No, it's about splitting up a single commit into multiple ones, I recall git-scm mentioned something you can use to picke line by line what should go into which commit.# [01:09:08] That seems a lot harder than squash :P [01:15:04] Yeah, but that's just "put everything from X commits into one commit", something one can automate just fine - obviously you'll have to decide what goes where when doing "split one commit into X commits" ;) [01:15:16] Which is exactly what I don't want to do :P [01:16:28] You can unstage the commit... And then add on a file by file basis [01:16:41] I don't remember seeing anything to do it line by line [01:17:29] I'd take a copy of all the files... [01:17:38] Remove the changes from the commit you don't want. Commit [01:17:42] Copy over, commit no 2 [01:22:18] git add -i (https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging) is what I meant, though I'm not convinced that that's the easiest way to go either. :D