* [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES
@ 2007-05-02 23:01 Jari Aalto
0 siblings, 0 replies; only message in thread
From: Jari Aalto @ 2007-05-02 23:01 UTC (permalink / raw)
To: git
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-05-02 23:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-02 23:01 [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES Jari Aalto
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.