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

Merge branch 'xf/user-manual-ff' into maint 

* xf/user-manual-ff:
  user-manual: fix the description of fast-forward
maint
Junio C Hamano 2015-11-04 14:20:49 -08:00
parent 6c66686e0b b2af4829cc
commit 684fea3794
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