development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-26 19:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* xf/user-manual-ff:
  user-manual: fix the description of fast-forward
This commit is contained in:
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
were merged.
However, if the current branch is a descendant of the other--so every
commit present in the one is already contained in the other--then Git
just performs a "fast-forward"; the head of the current branch is moved
forward to point at the head of the merged-in branch, without any new
commits being created.
However, if the current branch is an ancestor of the other--so every commit
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 forward
to point at the head of the merged-in branch, without any new commits being
created.
[[fixing-mistakes]]
Fixing mistakes