Git development
 help / color / mirror / Atom feed
From: Sitaram Chamarty <sitaramc@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH] Documentation: clarify commits affected by gitk --merge
Date: Fri, 6 Feb 2009 10:10:53 +0530	[thread overview]
Message-ID: <20090206044053.GA6831@atcmail.atc.tcs.com> (raw)

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
---

I remember being confused by this some weeks ago and someone clarified, so I
thought I'd put it in.

 Documentation/gitk.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75..bd005bc 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -47,7 +47,8 @@ frequently used options.
 
 	After an attempt to merge stops with conflicts, show the commits on
 	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
-	that modify the conflicted files.
+	that modify the conflicted files and do not exist on all the heads
+	being merged.
 
 --argscmd=<command>::
 	Command to be run each time gitk has to determine the list of
-- 
1.6.1

             reply	other threads:[~2009-02-06  5:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-06  4:40 Sitaram Chamarty [this message]
2009-02-07 21:45 ` [PATCH] Documentation: clarify commits affected by gitk --merge Junio C Hamano
2009-02-08  1:15   ` Sitaram Chamarty

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=20090206044053.GA6831@atcmail.atc.tcs.com \
    --to=sitaramc@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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