From: Richard Quirk <richard.quirk@gmail.com>
To: git@vger.kernel.org
Cc: Richard Quirk <richard.quirk@gmail.com>
Subject: [PATCH] Documentation gitk: Describe what --merge does
Date: Sun, 27 Apr 2008 17:51:09 +0200 [thread overview]
Message-ID: <1209311469-7561-1-git-send-email-richard.quirk@gmail.com> (raw)
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
---
Documentation/gitk.txt | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83..edd6547 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -41,6 +41,11 @@ frequently used options.
Show all branches.
+--merge::
+
+ Show the differences between HEAD and MERGE_HEAD for files with
+ conflicts after a merge.
+
<revs>::
Limit the revisions to show. This can be either a single revision
--
1.5.5.1.79.g57cf
next reply other threads:[~2008-04-27 15:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-27 15:51 Richard Quirk [this message]
2008-04-27 20:37 ` [PATCH] Documentation gitk: Describe what --merge does Junio C Hamano
2008-04-28 20:58 ` Richard Quirk
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=1209311469-7561-1-git-send-email-richard.quirk@gmail.com \
--to=richard.quirk@gmail.com \
--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).