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>
Xue Fuqiao committed
Oct 25, 2015 at 08:28 UTC
b2af4829cc51fc90885948f19f24b76f2670a677
1 file changed
+5
-5
Documentation/user-manual.txt
+5
-5
@@ -1431,11 +1431,11 @@ differently. Normally, a merge results in a merge commit, with two
1431
parents, one pointing at each of the two lines of development that
1432
were merged.
1433
1434
-However, if the current branch is a descendant of the other--so every
1435
-commit present in the one is already contained in the other--then Git
1436
-just performs a "fast-forward"; the head of the current branch is moved
1437
-forward to point at the head of the merged-in branch, without any new
1438
-commits being created.
1434
+However, if the current branch is an ancestor of the other--so every commit
1435
+present in the current branch is already contained in the other branch--then Git
1436
+just performs a "fast-forward"; the head of the current branch is moved forward
1437
+to point at the head of the merged-in branch, without any new commits being
1438
+created.
1439
1440
[[fixing-mistakes]]
1441
Fixing mistakes