diff --abbrev: document --abbrev=<n> form.

It was implemented there but was not advertised.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3d1175e8646474ca35244a3d7e57cd02f18dc310..9e574a04d3904228f835eca2ab698c66b92bf2a8 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -18,12 +18,13 @@
        object name of pre- and post-image blob on the "index"
        line when generating a patch format output.     
 
        object name of pre- and post-image blob on the "index"
        line when generating a patch format output.     
 

---abbrev::
+--abbrev[=<n>]::

        Instead of showing the full 40-byte hexadecimal object
        name in diff-raw format output and diff-tree header
        Instead of showing the full 40-byte hexadecimal object
        name in diff-raw format output and diff-tree header

-       lines, show only handful prefix.  This is independent of
-       --full-index option above, which controls the diff-patch
-       output format.
+       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.
 
 -B::
        Break complete rewrite changes into pairs of delete and create.

diff --git a/diff.h b/diff.h
index c3486ffa8618c1b2478c7c7197399bc47af0cbf0..5696f2aff0644f331507679e0a58d7fcdc3501ec 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -103,7 +103,7 @@ extern void diffcore_std_no_resolve(struct diff_options *);
 "  --name-only   show only names of changed files.\n" \
 "  --name-status show names and status of changed files.\n" \
 "  --full-index  show full object name on index lines.\n" \
 "  --name-only   show only names of changed files.\n" \
 "  --name-status show names and status of changed files.\n" \
 "  --full-index  show full object name on index lines.\n" \

-"  --abbrev      abbreviate object names in diff-tree header and diff-raw.\n" \
+"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \

 "  -R            swap input file pairs.\n" \
 "  -B            detect complete rewrites.\n" \
 "  -M            detect renames.\n" \
 "  -R            swap input file pairs.\n" \
 "  -B            detect complete rewrites.\n" \
 "  -M            detect renames.\n" \