summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-01-13 15:17:08 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-14 09:25:58 -0800
commitb706fcfe93262e485976ed2bc648b779cc47981f (patch)
treea853676fafad870d31a5efe800d89c9b32bbab8d /Documentation
parentcommit: show interesting ident information in summary (diff)
downloadtgif-b706fcfe93262e485976ed2bc648b779cc47981f.tar.xz
commit: allow suppression of implicit identity advice
We now nag the user with a giant warning when their identity was pulled from the username, hostname, and gecos information, in case it is not correct. Most users will suppress this by simply setting up their information correctly. However, there may be some users who consciously want to use that information, because having the value change from host to host contains useful information. These users can now set advice.implicitidentity to false to suppress the message. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a1e36d7e42..6f70cc953e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -130,6 +130,10 @@ advice.*::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwritting local changes.
Default: true.
+ implicitIdentity::
+ Advice on how to set your identity configuration when
+ your information is guessed from the system username and
+ domain name. Default: true.
--
core.fileMode::