From: Jari Aalto <jari.aalto@cante.net>
To: git@vger.kernel.org
Subject: [PATCH] git-merge.1: Mention option -s at topic MERGE STRATEGIES
Date: Thu, 03 May 2007 02:01:35 +0300 [thread overview]
Message-ID: <1whyesog.fsf@cante.net> (raw)
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
reply other threads:[~2007-05-02 23:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1whyesog.fsf@cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).