summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2006-04-15 13:41:18 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-15 19:30:27 -0700
commit293532739415d287786a312ec10849723383796e (patch)
tree4525f9840d72189980a7e5c095b9ad81abe191fb /Documentation
parentdiff-files --stat: do not dump core with unmerged index. (diff)
downloadtgif-293532739415d287786a312ec10849723383796e.tar.xz
diff-options: add --patch-with-stat
With this option, git prepends a diffstat in front of the patch. Since I really, really do not know what a diffstat of a combined diff ("merge diff") should look like, the diffstat is not generated for these. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 447e522a7b..c183dc9da0 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,6 +10,9 @@
--stat::
Generate a diffstat instead of a patch.
+--patch-with-stat::
+ Generate patch and prepend its diffstat.
+
-z::
\0 line termination on output