Merge branch 'bg/merge-ff-only'

* bg/merge-ff-only:
  Teach 'git merge' and 'git pull' the option --ff-only

diff --cc Documentation/merge-options.txt
index 48d04a5d8833a2c83f1dc754c798688b194de5b9,27a9a8489c9c28cbb5f67281937c246b738f6d82..fec33943058ea3e139aff0b898ef55a677d4067e
--- 1/Documentation/merge-options.txt
--- 2/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -45,10 -46,25 +45,15 @@@ merge
        commit.  This allows you to create a single commit on
        top of the current branch whose effect is the same as
        merging another branch (or more in case of an octopus).
 -
 ---no-squash::
 -      Perform the merge and commit the result. This option can
 -      be used to override --squash.
 -
 ---no-ff::
 -      Generate a merge commit even if the merge resolved as a
 -      fast-forward.
 -
 ---ff::
 -      Do not generate a merge commit if the merge resolved as
 -      a fast-forward, only update the branch pointer. This is
 -      the default behavior of git-merge.
 ++
 +With --no-squash perform the merge and commit the result. This
 +option can be used to override --squash.
  
+ --ff-only::
+       Refuse to merge and exit with a non-zero status unless the
+       current `HEAD` is already up-to-date or the merge can be
+       resolved as a fast-forward.
+ 
  -s <strategy>::
  --strategy=<strategy>::
        Use the given merge strategy; can be supplied more than

diff --cc builtin-merge.c
Simple merge