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

Re: git reset --soft a merged commit

From
Jakub Narebski <jnareb@gmail.com>
Date
Nov 6, 2006, 09:01 UTC
Message-ID
<eimtkj$bkv$1@sea.gmane.org>
In-Reply-To
<fcaeb9bf0611052048r11816e76p88d568e3478c354b@mail.gmail.com>
Nguyen Thai Ngoc Duy wrote:
> I did "git reset --soft HEAD~1" where HEAD is a merged commit and
> committed again (nothing changed).  The new commit was not recorded as
> a merged commit. Is it intentional?

Yes, you have chosen to go back to 1st parent. The information about other parents got lost.

If you want to correct commit, even if it is merge commit, use
  git commit --amend
instead.
Or you can muck with MERGE_HEAD instead.
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Shawn Pearce
Message 3 of 3 in “git reset --soft a merged commit”
  1. Nguyen Thai Ngoc DuyNov 6, 2006
  2. Shawn PearceNov 6, 2006
  3. Jakub NarebskiNov 6, 2006

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.