git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jari Aalto <jari.aalto@cante.net>
Date
May 2, 2007, 23:01 UTC
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 <jari.aalto@cante.net>
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
Message 1 of 1 in “git-merge.1: Mention option -s at topic MERGE STRATEGIES”
  1. git-merge.1: Mention option -s at topic MERGE STRATEGIESJari Aalto, May 2, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.