summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-08-26 17:49:23 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-27 08:37:09 -0700
commitee22a2921569c075ffb7656a698fad8573111de4 (patch)
tree2facdd2806488a7f087b524a7f9f02e22f724d9f /Documentation
parentGit 2.28 (diff)
downloadtgif-ee22a2921569c075ffb7656a698fad8573111de4.tar.xz
pretty-options.txt: fix --no-abbrev-commit description
Description suggested --no-abbrev-commit negates --oneline as well as any other option that implies --abbrev-commit. Fix it to say that it's --abbrev-commit that is negated, not the option that implies it. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-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"