From: Xue Fuqiao Date: Sun, 25 Oct 2015 00:28:43 +0000 (+0800) Subject: user-manual: fix the description of fast-forward X-Git-Tag: v2.6.3~11^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2af4829cc51fc90885948f19f24b76f2670a677;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 46aa6bc1a6..f61f91fd32 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -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