diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:23 -0800 |
| commit | ded408fd20e2fedb76850c9fa9bbaa26b888aa7c (patch) | |
| tree | f048693eb0afb979809bee23bd03f3f2dd53564a /builtin/commit-tree.c | |
| parent | Merge branch 'jk/http-push-to-empty' (diff) | |
| parent | contrib: add credential helper for OS X Keychain (diff) | |
| download | git-ded408fd20e2fedb76850c9fa9bbaa26b888aa7c.tar.gz git-ded408fd20e2fedb76850c9fa9bbaa26b888aa7c.zip | |
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
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions