summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-04 11:19:11 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-04 11:19:11 -0800
commit3a5b6eeceb8ea149ec8c0139f64683942e62722b (patch)
tree22d3931ab246e836b6d7bb940c31110e1b0733ce /Documentation
parent2d808073db276a447eb6d7e45afe47a363ff6bbe (diff)
parent7f4d4746c14f928b7b6cdc2d21e4bbb2a770187f (diff)
downloadgit-3a5b6eeceb8ea149ec8c0139f64683942e62722b.tar.gz
Merge branch 'np/credential-cache-sighup'
Workaround for using credential-cache with emacs. * np/credential-cache-sighup: credential-cache: new option to ignore sighup
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b4b01948d0..2d06b11f25 100644
--- 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::