Re: git interactive rebase 'consume' command

From: John Keeping <john@keeping.me.uk>
Date: Jan 20, 2013, 14:17 UTC
Message-ID: <20130120141725.GL31172@serenity.lan>
In-Reply-To: <kdgtir$apt$1@ger.gmane.org>

On Sun, Jan 20, 2013 at 03:05:18PM +0100, Stephen Kelly wrote:

Show 29 quoted lines

> I find the fixup command during an interactive rebase useful.
> 
> Sometimes when cleaning up a branch, I end up in a situation like this:
> 
>  pick 07bc3c9 Good commit.
>  pick 1313a5e Commit to fixup into c2f62a3.
>  pick c2f62a3 Another commit.
> 
> So, I have to reorder the commits, and change 1313a5e to 'f'. An alternative 
> would be to squash 's' c2f62a3 into 1313a5e and clean up the commit message. 
> The problem with that is it ends up with the wrong author time information.
> 
> So, I usually reorder and then fixup, but that can also be problematic if I 
> get a conflict during the re-order (which is quite likely).
> 
> I would prefer to be able to mark a commit as 'should be consumed', so that:
> 
>  pick 07bc3c9 Good commit.
>  consume 1313a5e Commit to fixup into c2f62a3.
>  pick c2f62a3 Another commit.
> 
> will result in 
> 
>  pick 07bc3c9 Good commit.
>  pick 62a3c2f Another commit.
> 
> directly.
> 
> Any thoughts on that?

Are you aware of the "--autosqush" option to git-rebase (and the "rebase.autosquash" config setting)? I find that using that combined with the "--fixup" option to git-commit makes this workflow a lot more intuitive.

(Which is not to say that I wouldn't find an option like 'consume' useful but I find myself reordering the list very rarely since I started using "git commit --fixup=...".)

John