Merge branch 'so/pretty-abbrev-doc'

Documentation update for "--no-abbrev-commit".

* so/pretty-abbrev-doc:
  pretty-options.txt: fix --no-abbrev-commit description
This commit is contained in:
Junio C Hamano 2020-09-03 12:37:05 -07:00
commit b720ad266d

View File

@ -25,8 +25,8 @@ people using 80-column terminals.
--no-abbrev-commit:: --no-abbrev-commit::
Show the full 40-byte hexadecimal commit object name. This negates Show the full 40-byte hexadecimal commit object name. This negates
`--abbrev-commit` and those options which imply it such as `--abbrev-commit`, either explicit or implied by other options such
"--oneline". It also overrides the `log.abbrevCommit` variable. as "--oneline". It also overrides the `log.abbrevCommit` variable.
--oneline:: --oneline::
This is a shorthand for "--pretty=oneline --abbrev-commit" This is a shorthand for "--pretty=oneline --abbrev-commit"