summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-14 17:12:37 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-14 17:12:37 -0700
commit5fd51c77faeb362a5429061e595371b7a1c46c02 (patch)
tree151c00470194f143f7ae10cb2379f625627253f4 /Documentation
parentMerge branch 'se/rebase' into next (diff)
parentConvert some "apply --summary" users to "diff --summary". (diff)
downloadtgif-5fd51c77faeb362a5429061e595371b7a1c46c02.tar.xz
Merge branch 'se/diff' into next
* 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 c183dc9da0..f523ec2fbe 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.