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

Re: [PATCH] rebase -i: support single-letter abbreviations for the actions

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 29, 2007, 22:08 UTC
Message-ID
<7vzlz5jfa1.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<Pine.LNX.4.64.0709292243280.28395@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 9 quoted lines
> On Sat, 29 Sep 2007, Avi Kivity wrote:
>
>> > > Can we make "amend" like squash, except that it keeps the first 
>> > > commit's authorship instead of the second?  I often merge a commit 
>> > > with some minor fix that comes later, and usually want to keep the 
>> > > original author record.
>
> Thinking about this again... Maybe it is a better semantics anyway? What 
> do others think?

I never thought about whose commit the squashed ones become before this thread, but making squash quack as if "commit --amend" was done after running "cherry-pick -n" the second and later ones feels like the most natural semantics to me.

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 8 of 9 in “rebase -i: support single-letter abbreviations for the actions”
  1. rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin, Sep 29, 2007
  2. Junio C HamanoSep 29, 2007
  3. rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin, Sep 29, 2007
  4. Avi KivitySep 29, 2007
  5. Johannes SchindelinSep 29, 2007
  6. Avi KivitySep 29, 2007
  7. Johannes SchindelinSep 29, 2007
  8. Junio C HamanoSep 29, 2007
  9. rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin, Sep 29, 2007

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.