| commit | 24aff9060ebc061ba93ca7525e3c93f78e7ba5eb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Dec 2011 00:34:01 +0000 (20 16:34 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Dec 2011 00:34:01 +0000 (20 16:34 -0800) | ||
| tree | 3d91fea5cf94797252c66bcd60078a0a3196a3fc | treesnapshot (tar.gz zip) |
| parent | 9b637d383cd72e987a4f0098bbafa6bb39cf3d4b | commitdiff |
| parent | 34961d30dae69b00a8a5aabd568fb87f376ebb87 | commitdiff |
Merge branch 'jk/git-prompt' into next
* jk/git-prompt:
contrib: add credential helper for OS X Keychain
Makefile: OS X has /dev/tty
Makefile: linux has /dev/tty
credential: use git_prompt instead of git_getpass
prompt: use git_terminal_prompt
add generic terminal prompt function
refactor git_getpass into generic prompt function
move git_getpass to its own source file
imap-send: don't check return value of git_getpass
imap-send: avoid buffer overflow
Conflicts:
Makefile
* jk/git-prompt:
contrib: add credential helper for OS X Keychain
Makefile: OS X has /dev/tty
Makefile: linux has /dev/tty
credential: use git_prompt instead of git_getpass
prompt: use git_terminal_prompt
add generic terminal prompt function
refactor git_getpass into generic prompt function
move git_getpass to its own source file
imap-send: don't check return value of git_getpass
imap-send: avoid buffer overflow
Conflicts:
Makefile
| Makefile | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| connect.c | diff1 | diff2 | blobhistory |
| imap-send.c | diff1 | diff2 | blobhistory |