Merge branch 'maint'

[git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b5d9763594b3fcb4dcc273c0118f7edbf236380d..e112172ca57da75ce6c2dd447cc97c6aa2b6499e 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,8 +10,16 @@
 --patch-with-raw::
        Synonym for "-p --raw".
 
---stat::
-       Generate a diffstat.
+--stat[=width[,name-width]]::
+       Generate a diffstat.  You can override the default
+       output width for 80-column terminal by "--stat=width".
+       The width of the filename part can be controlled by
+       giving another width to it separated by a comma.
+
+--numstat::
+       Similar to \--stat, but shows number of added and
+       deleted lines in decimal notation and pathname without
+       abbreviation, to make it more machine friendly.
 
 --summary::
        Output a condensed summary of extended header information