diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
| commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
| tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /glossary-content.txt | |
| parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
| download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'glossary-content.txt')
| -rw-r--r-- | glossary-content.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index 43d84d15e..1f029f8aa 100644 --- a/glossary-content.txt +++ b/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>>. |