Skip to content

Commit

Permalink
diff --abbrev: document --abbrev=<n> form.
Browse files Browse the repository at this point in the history
It was implemented there but was not advertised.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Dec 20, 2005
1 parent 47dd0d5 commit 913419f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Documentation/diff-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
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
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.
Expand Down
2 changes: 1 addition & 1 deletion diff.h
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
" --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" \
Expand Down

0 comments on commit 913419f

Please sign in to comment.