From: Jari Aalto Date: Wed, 02 May 2007 23:01:35 GMT Subject: [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES Message-ID: <1whyesog.fsf@cante.net> 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 diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 9c08efa..fb0c9f7 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -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]. -- 1.5.1.3