A couple of fixes that I've noticed in passing.
Changes since v1:
* Drop 'i18n.txt: camel case and monospace "i18n.commitEncoding"' (it's already
merged to 'master')
* Change "object ID of the object" to "object name"
Denton Liu (2):
git-cat-file.txt: monospace args, placeholders and filenames
git-cat-file.txt: remove references to "sha1"
Documentation/git-cat-file.txt | 67 +++++++++++++++++-----------------
1 file changed, 34 insertions(+), 33 deletions(-)
Range-diff against v1:
1: cc48b12516 < -: ---------- i18n.txt: camel case and monospace "i18n.commitEncoding"
2: 7dab69ce23 = 1: 6d044cf540 git-cat-file.txt: monospace args, placeholders and filenames
3: 4030a678b9 ! 2: 1b57fdad97 git-cat-file.txt: remove references to "sha1"
@@ Documentation/git-cat-file.txt: object, with placeholders of the form `%(atom)`
`objectname`::
- The 40-hex object name of the object.
-+ The full hex representation of the object ID of the object.
++ The full hex representation of the object name.
`objecttype`::
The type of the object (the same as `cat-file -t` reports).
@@ Documentation/git-cat-file.txt: newline. The available atoms are:
If the object is stored as a delta on-disk, this expands to the
- 40-hex sha1 of the delta base object. Otherwise, expands to the
- null sha1 (40 zeroes). See `CAVEATS` below.
-+ full hex representation of the object ID of the delta base
-+ object. Otherwise, expands to the null OID (all zeroes). See
-+ `CAVEATS` below.
++ full hex representation of the delta base object name.
++ Otherwise, expands to the null OID (all zeroes). See `CAVEATS`
++ below.
`rest`::
If this atom is used in the output string, input lines are split
--
2.30.1.823.g0a3b79fd18
