tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'maint-1.6.3' into maint
[git.git]
/
Documentation
/
git-diff-files.txt
diff --git
a/Documentation/git-diff-files.txt
b/Documentation/git-diff-files.txt
index c5261415643d359648900e17f522ba7b96fed44a..4ef03578ebc58f3b678e8805644ae8c0ad4b998b 100644
(file)
--- a/
Documentation/git-diff-files.txt
+++ b/
Documentation/git-diff-files.txt
@@
-43,8
+43,7
@@
omit diff output for unmerged entries and just show "Unmerged".
-q::
Remain silent even on nonexistent files
-Output format
--------------
+
include::diff-format.txt[]