* git reset --soft a merged commit
@ 2006-11-06 4:48 Nguyen Thai Ngoc Duy
2006-11-06 4:50 ` Shawn Pearce
2006-11-06 9:01 ` Jakub Narebski
0 siblings, 2 replies; 3+ messages in thread
From: Nguyen Thai Ngoc Duy @ 2006-11-06 4:48 UTC (permalink / raw)
To: git
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?
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git reset --soft a merged commit
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
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Pearce @ 2006-11-06 4:50 UTC (permalink / raw)
To: Nguyen Thai Ngoc Duy; +Cc: git
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. :-(
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git reset --soft a merged commit
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
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Narebski @ 2006-11-06 9:01 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-11-06 9:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).