From: Sitaram Chamarty <sitaramc@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org
Subject: [PATCH] mention mergetool in gittutorial
Date: Mon, 27 Apr 2009 19:46:16 +0530 [thread overview]
Message-ID: <20090427141616.GA10750@atc.tcs.com> (raw)
---
This came up in IRC in some context, and pasky suggested it
might be useful to talk about mergetool in the tutorial.
Documentation/gittutorial.txt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index c5d5596..0d2e75d 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -239,8 +239,15 @@ markers will be left in the problematic files showing the conflict;
$ git diff
------------------------------------------------
-will show this. Once you've edited the files to resolve the
-conflicts,
+will show this. You can use your normal text editor to resolve the conflicts,
+or you can use linkgit:git-mergetool[1] to invoke any of a range of popular
+tools to help you do this. For example:
+
+------------------------------------------------
+$ git mergetool --tool=meld
+------------------------------------------------
+
+Once you've edited the files to resolve the conflicts,
------------------------------------------------
$ git commit -a
--
1.6.2.4
reply other threads:[~2009-04-27 14:16 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=20090427141616.GA10750@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;
as well as URLs for NNTP newsgroup(s).