Merge fixes up to GIT 1.0.5

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6b496ede2550cf573a3a7ce37db908e6b3ab631e..9e574a04d3904228f835eca2ab698c66b92bf2a8 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -18,6 +18,14 @@
        object name of pre- and post-image blob on the "index"
        line when generating a patch format output.     
 
+--abbrev[=<n>]::
+       Instead of showing the full 40-byte hexadecimal object
+       name in diff-raw format output and diff-tree header
+       lines, show only handful dhexigits prefix.  This is
+       independent of --full-index option above, which controls
+       the diff-patch output format.  Non default number of
+       digits can be specified with --abbrev=<n>.
+
 -B::
        Break complete rewrite changes into pairs of delete and create.