{"thread":{"id":"40634","subject":"[PATCH] user-manual: fix the description of fast-forward","startedAt":"2015-10-25T00:28:43Z","lastAt":"2015-10-26T20:04:41Z","messageCount":2,"participants":["Xue Fuqiao","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"272180","messageId":"1445732923-57550-1-git-send-email-xfq.free@gmail.com","threadId":"40634","inReplyTo":null,"subject":"[PATCH] user-manual: fix the description of fast-forward","fromName":"Xue Fuqiao","fromEmail":"xfq.free@gmail.com","sentAt":"2015-10-25T00:28:43Z","receivedAt":"2015-10-25T00:28:43Z","isPatch":true,"sender":{"key":"xfq.free@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2863444?v=4"},"body":"Currently, the \"Fast-forward merges\" section of user-manual.txt says if the\ncurrent branch is a descendant of the other, Git will perform a fast-forward\nmerge, but it should the other way around.  Correct this issue and improve\nwording.\n\nSigned-off-by: Xue Fuqiao <xfq.free@gmail.com>\nThanks-to: Junio C Hamano <gitster@pobox.com>\n---\n\nDiscussed in $gmane/280042.\n\n Documentation/user-manual.txt | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 1b7987e..d68df13 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1431,11 +1431,11 @@ differently.  Normally, a merge results in a merge commit, with two\n parents, one pointing at each of the two lines of development that\n were merged.\n \n-However, if the current branch is a descendant of the other--so every\n-commit present in the one is already contained in the other--then Git\n-just performs a \"fast-forward\"; the head of the current branch is moved\n-forward to point at the head of the merged-in branch, without any new\n-commits being created.\n+However, if the current branch is an ancestor of the other--so every commit\n+present in the current branch is already contained in the other branch--then Git\n+just performs a \"fast-forward\"; the head of the current branch is moved forward\n+to point at the head of the merged-in branch, without any new commits being\n+created.\n \n [[fixing-mistakes]]\n Fixing mistakes\n-- \n2.6.2\n"},{"id":"272260","messageId":"xmqqfv0xgzvq.fsf@gitster.mtv.corp.google.com","threadId":"40634","inReplyTo":"1445732923-57550-1-git-send-email-xfq.free@gmail.com","subject":"Re: [PATCH] user-manual: fix the description of fast-forward","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-10-26T20:04:41Z","receivedAt":"2015-10-26T20:04:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}