Merge branch 'jc/doc-merge-options' into maint

* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together

Documentation/merge-options.txt

@@ -13,13 +13,18 @@ inspect and further tweak the merge result before committing.
 	edit the default merge message.
 
 --ff::
+	When the merge resolves as a fast-forward, only update the branch
+	pointer, without creating a merge commit.  This is the default
+	behavior.
+
 --no-ff::
-	Do not generate a merge commit if the merge resolved as
+	Create a merge commit even when the merge resolves as a
-	a fast-forward, only update the branch pointer. This is
+	fast-forward.
-	the default behavior of git-merge.
+
-+
+--ff-only::
-With --no-ff Generate a merge commit even if the merge
+	Refuse to merge and exit with a non-zero status unless the
-resolved as a fast-forward.
+	current `HEAD` is already up-to-date or the merge can be
+	resolved as a fast-forward.
 
 --log[=<n>]::
 --no-log::
@@ -54,11 +59,6 @@ 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