# [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES 1 messages from 2007-05-02 to 2007-05-02. Participants: Jari Aalto. Thread: https://gitlist.dev/t/7949 ## Jari Aalto, 2007-05-02 23:01 Subject: [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES Message-ID: <1whyesog.fsf@cante.net> URL: https://gitlist.dev/e/1whyesog.fsf%40cante.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 ```