3 messages, 3 authors, 2016-08-11 · open the first message on its own page
From: Nguyen Thai Ngoc Duy <hidden>
Date: 2016-08-11 19:46:35
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? --
From: Shawn Pearce <hidden>
Date: 2016-08-11 19:35:26
Nguyen Thai Ngoc Duy [off-list ref] 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. :-( --
From: Jakub Narebski <hidden>
Date: 2016-08-11 20:07:00
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