Merge branch 'ct/prompt-untracked-fix'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 303de8eee55be473b3e76abde6373391c5a80fdf..bfba4ef078a916dd81782441b922b2059436164d 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -99,7 +99,9 @@ OPTIONS
        Sort in a specific order. Supported type is "refname"
        (lexicographic order), "version:refname" or "v:refname" (tag
        names are treated as versions). Prepend "-" to reverse sort
-       order.
+       order. When this option is not given, the sort order defaults to the
+       value configured for the 'tag.sort' variable if it exists, or
+       lexicographic order otherwise. See linkgit:git-config[1].
 
 --column[=<options>]::
 --no-column::
@@ -159,7 +161,7 @@ it in the repository configuration as follows:
 
 -------------------------------------
 [user]
-    signingkey = <gpg-key-id>
+    signingKey = <gpg-key-id>
 -------------------------------------
 
 
@@ -317,6 +319,7 @@ include::date-formats.txt[]
 SEE ALSO
 --------
 linkgit:git-check-ref-format[1].
+linkgit:git-config[1].
 
 GIT
 ---