summaryrefslogtreecommitdiff
path: root/Documentation/config.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/config.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/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 29559c88af..c67038b56d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -412,7 +412,7 @@ repository's usual working tree).
core.logAllRefUpdates::
Enable the reflog. Updates to a ref <ref> is logged to the file
"$GIT_DIR/logs/<ref>", by appending the new and old
- SHA1, the date/time and the reason of the update, but
+ SHA-1, the date/time and the reason of the update, but
only when the file exists. If this configuration
variable is set to true, missing "$GIT_DIR/logs/<ref>"
file is automatically created for branch heads (i.e. under