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

Re: Folding commits together

From
Jay Soffian <jaysoffian@gmail.com>
Date
Sep 22, 2010, 19:25 UTC
Message-ID
<AANLkTikqmJrLoF8tvpUoE7gfPOtHkFr0VMH0oqzdxani@mail.gmail.com>
In-Reply-To
<loom.20100922T132318-104@post.gmane.org>
On Wed, Sep 22, 2010 at 7:33 AM, Maaartin <grajcar1@seznam.cz> wrote:
Show 13 quoted lines
> Matthieu Moy <Matthieu.Moy <at> grenoble-inp.fr> writes:
>
>> Which exact command did you type? Something like this should do it:
>>
>> git rebase -i HEAD~3
>
> I've tried nearly everything, starting with
>
> git rebase -i d8e3842
>
> which should be the just the same as HEAD~3. I retract the question, my editor
> keeps opening a wrong file, which I've just spotted by accident. The problem was
> caused by a git-cygwin-emacsclient-emacs interaction, rebase works nicely.
Another way to do this if it's the top-most commits is:

$ git reset --soft HEAD~3 $ git commit --amend

j.
Previous: Maaartin
Message 4 of 4 in “Folding commits together”
  1. MaaartinSep 22, 2010
  2. Matthieu MoySep 22, 2010
  3. MaaartinSep 22, 2010
  4. Jay SoffianSep 22, 2010

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.