Merge branch 'js/completion-ctags-pattern-substitution-fix'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index af306209e936e0387e08d779815f995988565cc4..c0022920c0c644bba2ff9059ccbeb175d55aec30 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -919,7 +919,7 @@ for further details.
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
        will call this program with a suitable prompt as command-line argument
-       and read the password from its STDOUT. See also the 'core.askpass'
+       and read the password from its STDOUT. See also the 'core.askPass'
        option in linkgit:git-config[1].
 
 'GIT_TERMINAL_PROMPT'::