Merge branch 'master' into lj/refs

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 47ba9a403ae9379b87c54f0103297da9157237cb..7b7b9e8ce92db7fbb2072b75a613b073b0c5a4e6 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,8 +10,11 @@
 --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.
 
 --summary::
        Output a condensed summary of extended header information
@@ -36,6 +39,9 @@
        Turn off colored diff, even when the configuration file
        gives the default to color output.
 
+--color-words::
+       Show colored word diff, i.e. color words which have changed.
+
 --no-renames::
        Turn off rename detection, even when the configuration
        file gives the default to do so.