aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-21 18:40:15 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-21 18:40:15 -0700
commitad77690fe400d91d3da97e16c07f1a8591b19b99 (patch)
tree6b6264e1b76b1afc438856473ca45ad052a99b0c /Documentation/pretty-formats.txt
parentc6c4d616739b531b5689b78fbcb2c89d14e70a4f (diff)
parent57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643 (diff)
downloadgit-ad77690fe400d91d3da97e16c07f1a8591b19b99.tar.gz
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/pretty-formats.txt')
-rw-r--r--Documentation/pretty-formats.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index afac703f21..f5b50dcba2 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -75,7 +75,7 @@ This is designed to be as compact as possible.
* 'raw'
+
The 'raw' format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and 'parents' information show the
true parent commits, without taking grafts nor history