diff --abbrev: document --abbrev=<n> form.
It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 18, 2005 at 02:03 UTC
913419fcc648dd43d7f7afdd94fa25aee4f9798a
2 files changed
+6
-5
Documentation/diff-options.txt
+5
-4
@@ -18,12 +18,13 @@
18
object name of pre- and post-image blob on the "index"
19
line when generating a patch format output.
20
21
---abbrev::
21
+--abbrev[=<n>]::
22
Instead of showing the full 40-byte hexadecimal object
23
name in diff-raw format output and diff-tree header
24
- lines, show only handful prefix. This is independent of
25
- --full-index option above, which controls the diff-patch
26
- output format.
24
+ lines, show only handful dhexigits prefix. This is
25
+ independent of --full-index option above, which controls
26
+ the diff-patch output format. Non default number of
27
+ digits can be specified with --abbrev=<n>.
28
29
-B::
30
Break complete rewrite changes into pairs of delete and create.
diff.h
+1
-1
@@ -103,7 +103,7 @@ extern void diffcore_std_no_resolve(struct diff_options *);
103
" --name-only show only names of changed files.\n" \
104
" --name-status show names and status of changed files.\n" \
105
" --full-index show full object name on index lines.\n" \
106
-" --abbrev abbreviate object names in diff-tree header and diff-raw.\n" \
106
+" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
107
" -R swap input file pairs.\n" \
108
" -B detect complete rewrites.\n" \
109
" -M detect renames.\n" \