Merge branch 'bg/apply-blank-trailing-context'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 37ce9a17fc3d66c402954246c83d0ec93fe007af..722d704ff2de1abd3d77a18ca396ba96d5cab6bc 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -62,6 +62,11 @@ option can be used to override --squash.
        is used instead ('git merge-recursive' when merging a single
        head, 'git merge-octopus' otherwise).
 
+-X <option>::
+--strategy-option=<option>::
+       Pass merge strategy specific option through to the merge
+       strategy.
+
 --summary::
 --no-summary::
        Synonyms to --stat and --no-stat; these are deprecated and will be
@@ -76,8 +81,3 @@ ifndef::git-pull[]
 --verbose::
        Be verbose.
 endif::git-pull[]
-
--X <option>::
---strategy-option=<option>::
-       Pass merge strategy specific option through to the merge
-       strategy.