From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: git reset --soft a merged commit
Date: Mon, 06 Nov 2006 10:01:44 +0100 [thread overview]
Message-ID: <eimtkj$bkv$1@sea.gmane.org> (raw)
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
prev parent reply other threads:[~2006-11-06 9:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-06 4:48 git reset --soft a merged commit Nguyen Thai Ngoc Duy
2006-11-06 4:50 ` Shawn Pearce
2006-11-06 9:01 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='eimtkj$bkv$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).