Merge branch 'fc/doc-fast-forward'

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

Conflicts:
	builtin-merge.c

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-push.txt
Simple merge

diff --cc builtin-fetch.c
Simple merge

diff --cc builtin-merge.c
index c8d7bdecc4e91392fa9e2614a6b9790e48fc0abd,a595b8b47b5eebae08ac02775679e066265552bd..57eedd447d0f899a258998bb3039905a5a49babb
--- 1/builtin-merge.c
--- 2/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
                }
        }
  
-               die("Not possible to fast forward, aborting.");
 +      if (fast_forward_only)
++              die("Not possible to fast-forward, aborting.");
 +
        /* We are going to make a new commit. */
        git_committer_info(IDENT_ERROR_ON_NO_NAME);
  

diff --cc builtin-push.c
Simple merge

diff --cc builtin-receive-pack.c
Simple merge

diff --cc git-pull.sh
Simple merge

diff --cc git-rebase--interactive.sh
Simple merge

diff --cc transport.c
Simple merge