Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
diff --git a/builtin-merge.c b/builtin-merge.c
index c8d7bde..57eedd4 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -167,9 +167,9 @@
OPT_BOOLEAN(0, "commit", &option_commit,
"perform a commit if the merge succeeds (default)"),
OPT_BOOLEAN(0, "ff", &allow_fast_forward,
- "allow fast forward (default)"),
+ "allow fast-forward (default)"),
OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
- "abort if fast forward is not possible"),
+ "abort if fast-forward is not possible"),
OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
"merge strategy to use", option_parse_strategy),
OPT_CALLBACK('m', "message", &merge_msg, "message",
@@ -1021,7 +1021,7 @@
hex,
find_unique_abbrev(remoteheads->item->object.sha1,
DEFAULT_ABBREV));
- strbuf_addstr(&msg, "Fast forward");
+ strbuf_addstr(&msg, "Fast-forward");
if (have_message)
strbuf_addstr(&msg,
" (no commit created; -m option ignored)");
@@ -1039,12 +1039,12 @@
} else if (!remoteheads->next && common->next)
;
/*
- * We are not doing octopus and not fast forward. Need
+ * We are not doing octopus and not fast-forward. Need
* a real merge.
*/
else if (!remoteheads->next && !common->next && option_commit) {
/*
- * We are not doing octopus, not fast forward, and have
+ * We are not doing octopus, not fast-forward, and have
* only one common.
*/
refresh_cache(REFRESH_QUIET);
@@ -1088,7 +1088,7 @@
}
if (fast_forward_only)
- die("Not possible to fast forward, aborting.");
+ die("Not possible to fast-forward, aborting.");
/* We are going to make a new commit. */
git_committer_info(IDENT_ERROR_ON_NO_NAME);
