aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-15 23:42:37 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-15 23:42:37 -0700
commit638684824c419f4368512c6f54ac32dd4e6c56a6 (patch)
treeb9d30b4c1911deade512f24e9abc6e5264b64a0f /Documentation
parent3b4fd63f72cb19288d23c9622366bbe32e55613f (diff)
parent9d76812b42009069aa3ff8f29e51b5150aa04e8e (diff)
downloadgit-638684824c419f4368512c6f54ac32dd4e6c56a6.tar.gz
git-638684824c419f4368512c6f54ac32dd4e6c56a6.tar.xz
Merge branch 'se/diff'
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c183dc9da..f523ec2fb 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,6 +10,10 @@
--stat::
Generate a diffstat instead of a patch.
+--summary::
+ Output a condensed summary of extended header information
+ such as creations, renames and mode changes.
+
--patch-with-stat::
Generate patch and prepend its diffstat.