Re: rebase autosquash doesn't recognise a chain of fixups
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 5, 2011, 21:03 UTC
- Message-ID
- <7v8vvommwf.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <BANLkTimqvu7c559_AQ6yLxPACOxD0ciNxQ@mail.gmail.com>
Kevin Ballard <kevin@sb.org> writes:
Show 19 quoted lines
> On Tue, Apr 5, 2011 at 11:27 AM, Junio C Hamano <gitster@pobox.com> wrote: > >> Kevin Ballard <kevin@sb.org> writes: >> >> > This seems unnecessary. `git commit --fixup HEAD` doesn't really make any >> sense at all to run when you can say `git commit --amend` instead, >> >> What about this sequence? >> >> git commit -m 'foo' >> git commit -m 'bar' >> git commit --fixup HEAD~1 >> git commit -m 'baz' >> git commit --fixup HEAD~1 >> >> > You raise a good point. I personally think someone who types that deserves > what he gets, but I have no objection to being intelligent about duplicate > fixup! prefixes.
Of course an alternative solution is to fix this on the "rebase -i" side, by building on top of your d3d7a42 (rebase: better rearranging of fixup!/squash! lines with --autosquash, 2010-11-04).
Or perhaps we would want to do both.