# [PATCH] user-manual: fix the description of fast-forward 2 messages from 2015-10-25 to 2015-10-26. Participants: Xue Fuqiao, Junio C Hamano. Thread: https://gitlist.dev/t/40634 ## Xue Fuqiao, 2015-10-25 00:28 Subject: [PATCH] user-manual: fix the description of fast-forward Message-ID: <1445732923-57550-1-git-send-email-xfq.free@gmail.com> URL: https://gitlist.dev/e/1445732923-57550-1-git-send-email-xfq.free%40gmail.com ``` Currently, 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 Thanks-to: Junio C Hamano --- Discussed in $gmane/280042. Documentation/user-manual.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 ``` ## Junio C Hamano, 2015-10-26 20:04 Subject: Re: [PATCH] user-manual: fix the description of fast-forward Message-ID: URL: https://gitlist.dev/e/xmqqfv0xgzvq.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1445732923-57550-1-git-send-email-xfq.free@gmail.com> ``` Thanks. ```