From: Jakub Narebski <jnareb@gmail.com>
Date: Mon, 06 Nov 2006 09:01:44 GMT
Subject: Re: git reset --soft a merged commit
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