aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-18 02:03:15 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-19 18:32:44 -0800
commit913419fcc648dd43d7f7afdd94fa25aee4f9798a (patch)
tree46aedde9188272974f3ab9d10eaa0f226b94035d
parent47dd0d595d04ee5283dfd8a0b4cbd6e6de8ad57f (diff)
downloadgit-913419fcc648dd43d7f7afdd94fa25aee4f9798a.tar.gz
git-913419fcc648dd43d7f7afdd94fa25aee4f9798a.tar.xz
diff --abbrev: document --abbrev=<n> form.
It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/diff-options.txt9
-rw-r--r--diff.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3d1175e86..9e574a04d 100644
--- 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.
---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.
diff --git a/diff.h b/diff.h
index c3486ffa8..5696f2aff 100644
--- 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" \
-" --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" \