X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=5064bf83fa20c12cc699e5432e6dd6d29eda22de;hb=b40bb374a618534b930ce4da5ffffb215b5cb488;hp=48d04a5d8833a2c83f1dc754c798688b194de5b9;hpb=78b77c491ff21e27dbaf1381268aeb380f0607b8;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 48d04a5d8..5064bf83f 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -49,13 +49,18 @@ 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
 	once to specify them in the order they should be tried.
 	If there is no `-s` option, a built-in list of strategies
-	is used instead ('git-merge-recursive' when merging a single
-	head, 'git-merge-octopus' otherwise).
+	is used instead ('git merge-recursive' when merging a single
+	head, 'git merge-octopus' otherwise).
 
 --summary::
 --no-summary::