Merge branch 'jk/credential-quit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:19 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:20 +0000 (12:27 -0800)
Credential helpers are asked in turn until one of them give
positive response, which is cumbersome to turn off when you need to
run Git in an automated setting. The credential helper interface
learned to allow a helper to say "stop, don't ask other helpers."
Also GIT_TERMINAL_PROMPT environment can be set to false to disable
our built-in prompt mechanism for passwords.

* jk/credential-quit:
prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
credential: let helpers tell us to quit

1  2 
Documentation/git.txt
credential.c
prompt.c
Simple merge
diff --cc credential.c
Simple merge
diff --cc prompt.c
Simple merge