From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Nov 2009 00:41:02 +0000 (-0800)
Subject: Merge branch 'fc/doc-fast-forward'
X-Git-Tag: v1.6.6-rc0~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4d8c3258880548510b1d23f0db517adb7dfd2486;p=git.git

Merge branch 'fc/doc-fast-forward'

* fc/doc-fast-forward:
  Use 'fast-forward' all over the place

Conflicts:
	builtin-merge.c
---

4d8c3258880548510b1d23f0db517adb7dfd2486
diff --cc builtin-merge.c
index c8d7bdecc,a595b8b47..57eedd447
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@@ -167,9 -166,7 +167,9 @@@ static struct option builtin_merge_opti
  	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",
@@@ -1087,9 -1079,6 +1087,9 @@@ int cmd_merge(int argc, const char **ar
  		}
  	}
  
 +	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);