progit2 icon indicating copy to clipboard operation
progit2 copied to clipboard

[7.8 Git Tools - Advanced Merging -- Reverse the commit ] may has some error description

Open lingjieding opened this issue 5 years ago • 0 comments

Which version of the book is affected? all

Describe the bug: the description in [7.8 Git Tools - Advanced Merging -- Reverse the commit ] is: "The -m 1 flag indicates which parent is the “mainline” and should be kept. When you invoke a merge into HEAD (git merge topic), the new commit has two parents: the first one is HEAD (C6)"; I think after the merge, this first parent is C6, right now the HEAD refs to M(the commit refs to merge), not C6

Steps to reproduce:

  1. Go to https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
  2. Scroll down to 'Reverse the commit'
  3. you'll see what i descibed

Expected behavior: where it said "When you invoke a merge into HEAD (git merge topic), the new commit has two parents: the first one is HEAD (C6)" should be "When you invoke a merge into HEAD (git merge topic), the new commit has two parents: the first one is C6"

Screenshots: image

lingjieding avatar Feb 27 '21 19:02 lingjieding