[PATCH] mention mergetool in gittutorial
From: Sitaram Chamarty <hidden>
Date: 2016-06-15 22:46:40
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
--- 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