git-merge.1: Mention option -s at topic MERGE STRATEGIES

PATCH New Jari Aalto 1 participant 1 message Jun 15, 2016 Documentation

Share & tools

Jari Aalto

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 1/1 git-merge.1: Mention option -s at topic MERGE STRATEGIES

When the option is reminded at the same place as the explanation text, this will help reader to associate these two. Sidenote: text may be currently scrolled in a manual reader or HTML page to hide the mentioned options at the beginning.

Signed-off-by Jari Aalto <[email protected]>

Documentation/git-merge.txt +1 -1

index 9c08efa..fb0c9f7 100644
@@ -38,7 +38,7 @@ include::merge-options.txt[]
 
 include::merge-strategies.txt[]
 
-
+The strategy is defined by supplying option '-s'.
 If you tried a merge which resulted in a complex conflicts and
 would want to start over, you can recover with
 gitlink:git-reset[1].

Signature · 1 line

1.5.1.3