summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-03 12:37:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-03 12:37:06 -0700
commitb720ad266d0740e99cfb18ce571f211998c463a5 (patch)
tree1fef909707350d92793cc357f9869f1785863c65
parentMerge branch 'mr/diff-hide-stat-wo-textual-change' (diff)
parentpretty-options.txt: fix --no-abbrev-commit description (diff)
downloadtgif-b720ad266d0740e99cfb18ce571f211998c463a5.tar.xz
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.txt4
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"