diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 14:20:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 14:20:49 -0800 |
| commit | 684fea37948d720cc69b3553b42353b4b42709dc (patch) | |
| tree | b89542cdb28e65a958938c7f51f0df97e7d0b68c /Documentation | |
| parent | 6c66686e0b917df914af779257479c341590a9a0 (diff) | |
| parent | b2af4829cc51fc90885948f19f24b76f2670a677 (diff) | |
| download | git-684fea37948d720cc69b3553b42353b4b42709dc.tar.gz git-684fea37948d720cc69b3553b42353b4b42709dc.tar.xz | |
Merge branch 'xf/user-manual-ff' into maint
* xf/user-manual-ff:
user-manual: fix the description of fast-forward
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 764a270c8..1c790ac74 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 |