Merge branch 'fg/document-commit-message-stripping'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9dfa1a5ce265eacd64febc3775cb05525b58d7f0..02ec096faac77acace9b36d60e6b1889ac18e85e 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -405,7 +405,7 @@ true
 % git config --bool --get-urlmatch http.sslverify https://weak.example.com
 false
 % git config --get-urlmatch http https://weak.example.com
-http.cookiefile /tmp/cookie.txt
+http.cookieFile /tmp/cookie.txt
 http.sslverify false
 ------------