diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
| commit | ad77690fe400d91d3da97e16c07f1a8591b19b99 (patch) | |
| tree | 6b6264e1b76b1afc438856473ca45ad052a99b0c /Documentation/git-cat-file.txt | |
| parent | Merge branch 'jk/doc-http-backend' (diff) | |
| parent | glossary: improve definitions of refspec and pathspec (diff) | |
| download | tgif-ad77690fe400d91d3da97e16c07f1a8591b19b99.tar.xz | |
Merge branch 'ta/glossary'
* ta/glossary:
glossary: improve definitions of refspec and pathspec
The name of the hash function is "SHA-1", not "SHA1"
glossary: improve description of SHA-1 related topics
glossary: remove outdated/misleading/irrelevant entries
Diffstat (limited to 'Documentation/git-cat-file.txt')
| -rw-r--r-- | Documentation/git-cat-file.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 2fb95bbd19..30d585af5d 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -20,7 +20,7 @@ object type, or '-s' is used to find the object size, or '--textconv' is used (which implies type "blob"). In the second form, a list of objects (separated by linefeeds) is provided on -stdin, and the SHA1, type, and size of each object is printed on stdout. +stdin, and the SHA-1, type, and size of each object is printed on stdout. OPTIONS ------- @@ -58,11 +58,11 @@ OPTIONS to apply the filter to the content recorded in the index at <path>. --batch:: - Print the SHA1, type, size, and contents of each object provided on + Print the SHA-1, type, size, and contents of each object provided on stdin. May not be combined with any other options or arguments. --batch-check:: - Print the SHA1, type, and size of each object provided on stdin. May not + Print the SHA-1, type, and size of each object provided on stdin. May not be combined with any other options or arguments. OUTPUT |