Xue FuqiaoCurrently, the "Fast-forward merges" section of user-manual.txt 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. Correct this issue and improve wording.
Signed-off-by: Xue Fuqiao <xfq.free@gmail.com> Thanks-to: Junio C Hamano <gitster@pobox.com> ---
Discussed in $gmane/280042.
Documentation/user-manual.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Show changes to Documentation/user-manual.txt +5 −5
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1b7987e..d68df13 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
-- 2.6.2
