{"thread":{"id":"7949","subject":"[PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES","startedAt":"2007-05-02T23:01:35Z","lastAt":"2007-05-02T23:01:35Z","messageCount":1,"participants":["Jari Aalto"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"40926","messageId":"1whyesog.fsf@cante.net","threadId":"7949","inReplyTo":null,"subject":"[PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2007-05-02T23:01:35Z","receivedAt":"2007-05-02T23:01:35Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"When the option is reminded at the same place as the explanation text,\nthis will help reader to associate these two. Sidenote: text may be\ncurrently scrolled in a manual reader or HTML page to hide the\nmentioned options at the beginning.\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 9c08efa..fb0c9f7 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -38,7 +38,7 @@ include::merge-options.txt[]\n \n include::merge-strategies.txt[]\n \n-\n+The strategy is defined by supplying option '-s'.\n If you tried a merge which resulted in a complex conflicts and\n would want to start over, you can recover with\n gitlink:git-reset[1].\n-- \n1.5.1.3\n"}]}