| commit | ded408fd20e2fedb76850c9fa9bbaa26b888aa7c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Dec 2011 19:27:23 +0000 (22 11:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Dec 2011 19:27:23 +0000 (22 11:27 -0800) | ||
| tree | f048693eb0afb979809bee23bd03f3f2dd53564a | treesnapshot (tar.gz zip) |
| parent | 200888ef3bbc150cc20b99e0aa039c751c00e07a | commitdiff |
| parent | 34961d30dae69b00a8a5aabd568fb87f376ebb87 | commitdiff |
Merge branch 'jk/git-prompt'
* 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 |