Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
difftool: teach difftool to handle directory diffs
[gitweb.git]
/
Documentation
/
git-difftool.txt
diff --git
a/Documentation/git-difftool.txt
b/Documentation/git-difftool.txt
index fe38f667f9cd232c3c7a8bc7653648995b3ce4aa..aba5e76c52761af456db7f2c00786a9b5a1d97fa 100644
(file)
--- 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.