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

Re: rebase edit handling

From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date
May 13, 2009, 09:52 UTC
Message-ID
<fcaeb9bf0905130252t2a55b742j425d121eb06b9193@mail.gmail.com>
In-Reply-To
<589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk>

On Wed, May 13, 2009 at 6:18 PM, Anders Melchiorsen <mail@cup.kalibalik.dk> wrote:

Show 13 quoted lines
> On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy
> <pclouds@gmail.com>
> wrote:
>
>> Could we unit the way to squash/edit commits in rebase? If I squash a
>> commit it, I need to to update the index and continue rebase. If I
>> edit a commit, I need to amend that commit. The problem is when I have
>> a few edits/squashes in the same rebase, I easily get confused and do
>> "commit --amend" on squash too.
>
> A squash does not leave you at the prompt, unless you abort the editor
> with the concatenated commit messages. So where does your confusion
> come from?

Hmm.. I was confused even when writing mail :P No not squash, actually conflicts.

Show 6 quoted lines
> Anyway, here is a (fruitless) thread on the confusing UI of interactive
> rebase:
>
>  http://thread.gmane.org/gmane.comp.version-control.git/105738
>
> Maybe it answers your question in some way.
Yes, looks interesting.
-- 
Duy
Previous: Anders Melchiorsen
Message 4 of 4 in “rebase edit handling”
  1. Nguyen Thai Ngoc DuyMay 13, 2009
  2. Nguyen Thai Ngoc DuyMay 13, 2009
  3. Anders MelchiorsenMay 13, 2009
  4. Nguyen Thai Ngoc DuyMay 13, 2009

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.