git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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.
Previous: Junio C Hamano
Message 7 of 7 in “rebase autosquash doesn't recognise a chain of fixups”
  1. Carlos Martín NietoApr 5, 2011
  2. Vincent van RavesteijnApr 5, 2011
  3. Carlos Martín NietoApr 5, 2011
  4. Junio C HamanoApr 5, 2011
  5. Kevin BallardApr 5, 2011
  6. Junio C HamanoApr 5, 2011
  7. Junio C HamanoApr 5, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.