diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:06 +0300 |
| commit | b720ad266d0740e99cfb18ce571f211998c463a5 (patch) | |
| tree | 1fef909707350d92793cc357f9869f1785863c65 | |
| parent | b58e47a929ec3d3d5fe63f18ae9539ffe9051c51 (diff) | |
| parent | ee22a2921569c075ffb7656a698fad8573111de4 (diff) | |
Merge branch 'so/pretty-abbrev-doc'
Documentation update for "--no-abbrev-commit".
* so/pretty-abbrev-doc:
pretty-options.txt: fix --no-abbrev-commit description
| -rw-r--r-- | Documentation/pretty-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 7a6da6db78..17c5aac4b7 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -25,8 +25,8 @@ people using 80-column terminals. --no-abbrev-commit:: Show the full 40-byte hexadecimal commit object name. This negates - `--abbrev-commit` and those options which imply it such as - "--oneline". It also overrides the `log.abbrevCommit` variable. + `--abbrev-commit`, either explicit or implied by other options such + as "--oneline". It also overrides the `log.abbrevCommit` variable. --oneline:: This is a shorthand for "--pretty=oneline --abbrev-commit" |