diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:46 -0700 |
| commit | 096c948dabc7d13a6cc81a8ad803fd96fc1c5d15 (patch) | |
| tree | 485338e755482416f20097587126fcaf795ec170 /Documentation | |
| parent | Merge branch 'am/ci-wsfix' (diff) | |
| parent | diff: index-line: respect --abbrev in object's name (diff) | |
| download | tgif-096c948dabc7d13a6cc81a8ad803fd96fc1c5d15.tar.xz | |
Merge branch 'dd/diff-customize-index-line-abbrev'
The output from the "diff" family of the commands had abbreviated
object names of blobs involved in the patch, but its length was not
affected by the --abbrev option. Now it is.
* dd/diff-customize-index-line-abbrev:
diff: index-line: respect --abbrev in object's name
t4013: improve diff-post-processor logic
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b7af973d9c..573fb9bb71 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -446,10 +446,11 @@ endif::git-format-patch[] --abbrev[=<n>]:: Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only a partial prefix. This is - independent of the `--full-index` option above, which controls - the diff-patch output format. Non default number of - digits can be specified with `--abbrev=<n>`. + lines, show only a partial prefix. + In diff-patch output format, `--full-index` takes higher + precedence, i.e. if `--full-index` is specified, full blob + names will be shown regardless of `--abbrev`. + Non default number of digits can be specified with `--abbrev=<n>`. -B[<n>][/<m>]:: --break-rewrites[=[<n>][/<m>]]:: |