Sync with 2.6.5

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8c02e434833e2b8f270a5fe3d31a07f8848f9dc5..f61788668e89b659439e2fa5d600aebabdd733a5 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1122,6 +1122,9 @@ credential.<url>.*::
        example.com. See linkgit:gitcredentials[7] for details on how URLs are
        matched.
 
+credentialCache.ignoreSIGHUP::
+       Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
+
 include::diff-config.txt[]
 
 difftool.<tool>.path::