git-cat-file.txt: remove references to "sha1"

As part of the hash-transition, git can operate on more than just SHA-1
repositories. Replace "sha1"-specific documentation with hash-agnostic
terminology.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index a1c37a9e81718b44e4cd0f1c0b1e02c43d8e26b3..4eb0421b3fd946e709318d835783530bb89e7caa 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -200,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a
 newline. The available atoms are:
 
 `objectname`::
-       The 40-hex object name of the object.
+       The full hex representation of the object name.
 
 `objecttype`::
        The type of the object (the same as `cat-file -t` reports).
@@ -215,8 +215,9 @@ newline. The available atoms are:
 
 `deltabase`::
        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 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
@@ -235,14 +236,14 @@ newline.
 For example, `--batch` without a custom format would produce:
 
 ------------
-<sha1> SP <type> SP <size> LF
+<oid> SP <type> SP <size> LF
 <contents> LF
 ------------
 
 Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:
 
 ------------
-<sha1> SP <type> LF
+<oid> SP <type> LF
 ------------
 
 If a name is specified on stdin that cannot be resolved to an object in