summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorTim Henigan <tim.henigan@gmail.com>2012-04-23 14:23:41 -0400
committerJunio C Hamano <gitster@pobox.com>2012-04-23 11:59:34 -0700
commit7e0abcec103b3649943b236881cf88e8fd6cf3a4 (patch)
tree99936329de9603b8284f7d0eda6d2b09c5723193 /Documentation/git-difftool.txt
parente9653615fafcbac6109da99fac4fa66b0b432048 (diff)
downloadgit-7e0abcec103b3649943b236881cf88e8fd6cf3a4.tar.gz
difftool: teach difftool to handle directory diffs
When 'difftool' is called to compare a range of commits that modify more than one file, it opens a separate instance of the diff tool for each file that changed. The new '--dir-diff' option copies all the modified files to a temporary location and runs a directory diff on them in a single instance of the diff tool. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index fe38f667f9..aba5e76c52 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -19,6 +19,12 @@ linkgit:git-diff[1].
OPTIONS
-------
+-d::
+--dir-diff::
+ Copy the modified files to a temporary location and perform
+ a directory diff on them. This mode never prompts before
+ launching the diff tool.
+
-y::
--no-prompt::
Do not prompt before launching a diff tool.