diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /Documentation/glossary-content.txt | |
| parent | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (diff) | |
| parent | a75d7b54097ef0d0945cbe673a9940d6c561f95c (diff) | |
| download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.gz | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 43d84d15e9..1f029f8aa0 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -124,7 +124,7 @@ to point at the new commit. An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>. -[[def_fast_forward]]fast forward:: +[[def_fast_forward]]fast-forward:: A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are "merging" another <<def_branch,branch>>'s changes that happen to be a descendant of what @@ -220,7 +220,7 @@ to point at the new commit. conflict, manual intervention may be required to complete the merge. + -As a noun: unless it is a <<def_fast_forward,fast forward>>, a +As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. |