path: root/Documentation/glossary-content.txt
diff options
authorFelipe Contreras <>2009-10-24 08:31:32 (GMT)
committerJunio C Hamano <>2009-10-25 06:50:28 (GMT)
commita75d7b54097ef0d0945cbe673a9940d6c561f95c (patch)
tree40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/glossary-content.txt
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
Use 'fast-forward' all over the place
It's a compound word. Signed-off-by: Felipe Contreras <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/glossary-content.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 43d84d1..1f029f8 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::
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
-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>>.