Merge branch 'jc/reopen-lock-file'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1d718bdb9662735d9b446033607c5f2aa92f8a78..c55c22ab7be94e798164a48622aca21dd4daa44f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2354,6 +2354,11 @@ submodule.<name>.ignore::
        "--ignore-submodules" option. The 'git submodule' commands are not
        affected by this setting.
 
+tag.sort::
+       This variable controls the sort ordering of tags when displayed by
+       linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
+       value of this variable will be used as the default.
+
 tar.umask::
        This variable can be used to restrict the permission bits of
        tar archive entries.  The default is 0002, which turns off the