From: Shawn Pearce <spearce@spearce.org>
Date: Mon, 06 Nov 2006 04:50:38 GMT
Subject: Re: git reset --soft a merged commit
Message-ID: <20061106045038.GA22985@spearce.org>
In-Reply-To: <fcaeb9bf0611052048r11816e76p88d568e3478c354b@mail.gmail.com>

Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
> Hi,
> 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 undid the merge.  :-(

--