kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

user-manual: fix the description of fast-forward 

The "Fast-forward merges" section of user-manual.txt incorrectly
says if the current branch is a descendant of the other, Git will
perform a fast-forward merge, but it should the other way around.

Signed-off-by: Xue Fuqiao <xfq.free@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Xue Fuqiao 2015-10-25 08:28:43 +08:00 committed by Junio C Hamano
parent 282616c72d
commit b2af4829cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/user-manual.txt
View File

@ -1431,11 +1431,11 @@ differently. Normally, a merge results in a merge commit, with two
parents, one pointing at each of the two lines of development that parents, one pointing at each of the two lines of development that
were merged. were merged.


However, if the current branch is a descendant of the other--so every However, if the current branch is an ancestor of the other--so every commit
commit present in the one is already contained in the other--then Git present in the current branch is already contained in the other branch--then Git
just performs a "fast-forward"; the head of the current branch is moved just performs a "fast-forward"; the head of the current branch is moved forward
forward to point at the head of the merged-in branch, without any new to point at the head of the merged-in branch, without any new commits being
commits being created. created.


[[fixing-mistakes]] [[fixing-mistakes]]
Fixing mistakes Fixing mistakes