diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2015-10-25 08:28:43 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 13:03:44 -0700 |
| commit | b2af4829cc51fc90885948f19f24b76f2670a677 (patch) | |
| tree | dacae002ae40c7606062165a5d4f2887286f56dd /Documentation | |
| parent | 282616c72d1d08a77ca4fe1186cb708c38408d87 (diff) | |
| download | git-b2af4829cc51fc90885948f19f24b76f2670a677.tar.gz | |
user-manual: fix the description of fast-forwardxf/user-manual-ff
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/user-manual.txt | 10 |
1 files changed, 5 insertions, 5 deletions
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 |