X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=157d5d001fe3014def96e3660df7ee5b1b98c275;hb=002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc;hp=720f7a161651126872b7357173c10d69d1db7636;hpb=ab36d06f12b7243de419bb82b11a678bea30eef2;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 720f7a161..157d5d001 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -895,7 +895,7 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
  * Two-way merge.
  *
  * The rule is to "carry forward" what is in the index without losing
- * information across a "fast forward", favoring a successful merge
+ * information across a "fast-forward", favoring a successful merge
  * over a merge failure when it makes sense.  For details of the
  * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
  *