Merge branch 'bg/maint-remote-update-default' into maint

[git.git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 48d04a5d8833a2c83f1dc754c798688b194de5b9..fec33943058ea3e139aff0b898ef55a677d4067e 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -49,6 +49,11 @@ 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