config documentation: some configs are auto-set by git-init

diff --git a/unpack-trees.c b/unpack-trees.c
index c424bab4097818cf9e7910baaee98deaa7943cbc..dd5999c3562219b7993420b22257f4088ab82b8d 100644 (file)
--- 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>.
  *