diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 14:57:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 14:57:54 -0700 |
| commit | 448d13221622c70044962cac25e117c342dea9bb (patch) | |
| tree | 352665d68a735bf45d4d12f300548f480e3270e7 /user-manual.txt | |
| parent | ee615806f274b21a580f4f3d4380973fdcae6efa (diff) | |
| download | git-htmldocs-448d13221622c70044962cac25e117c342dea9bb.tar.gz | |
Autogenerated HTML docs for v2.6.2-402-g2635c2b
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/user-manual.txt b/user-manual.txt index 764a270c8..1c790ac74 100644 --- a/user-manual.txt +++ b/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 |