Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 47576be5dbcdfa855c6d5178a92b748c7d41002b..1c75be080368a5975b609cd8b902d224eabc9bd8 100644 (file)
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -32,7 +32,7 @@ strategies to ask the user for usernames and passwords:
    to the program on the command line, and the user's input is read
    from its standard output.
 
-2. Otherwise, if the `core.askpass` configuration variable is set, its
+2. Otherwise, if the `core.askPass` configuration variable is set, its
    value is used as above.
 
 3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its