Junio C Hamano 24aff9060e 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

2011-12-20 16:34:01 -08:00

..

fnmatch

compat/fnmatch/fnmatch.c: give a fall-back definition for NULL

2011-05-26 09:25:47 -07:00

nedmalloc

remove doubled words, e.g., s/to to/to/, and fix related typos

2011-04-13 11:59:11 -07:00

regex

Fix compat/regex ANSIfication on MinGW

2010-08-26 09:25:53 -07:00

vcbuild

MSVC: Remove unneeded header stubs

2011-10-31 20:06:06 -07:00

win32

compat/win32/poll.c: upgrade from upstream

2011-10-30 18:45:16 -07:00

basename.c

compat: add a basename() compatibility function

2009-05-31 17:57:59 -07:00

bswap.h

compat: make gcc bswap an inline function

2011-03-16 12:44:59 -07:00

cygwin.c

Merge branch 'jc/maint-cygwin-trust-executable-bit-default'

2011-07-13 14:31:36 -07:00

cygwin.h

…

fopen.c

…

hstrerror.c

…

inet_ntop.c

inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

2011-10-18 10:34:07 -07:00

inet_pton.c

compat: add inet_pton and inet_ntop prototypes

2010-11-04 16:53:49 -07:00

memmem.c

optimize compat/ memmem()

2009-03-02 18:28:06 -08:00

mingw.c

Merge branch 'maint-1.7.7' into maint

2011-12-09 13:33:39 -08:00

mingw.h

Merge branch 'maint-1.7.7' into maint

2011-12-09 13:33:39 -08:00

mkdtemp.c

Fix gitmkdtemp: correct test for mktemp() return value

2010-02-25 12:08:22 -08:00

mmap.c

…

msvc.c

win32: use our own dirent.h

2010-11-23 16:06:50 -08:00

msvc.h

Compile fix for MSVC: Include <io.h>

2011-10-31 20:06:03 -07:00

obstack.c

obstack.c: Fix some sparse warnings

2011-09-11 14:43:33 -07:00

obstack.h

obstack: Fix portability issues

2011-08-28 22:03:26 -07:00

pread.c

…

qsort.c

cleanup: use internal memory allocation wrapper functions everywhere

2011-10-06 13:54:32 -07:00

setenv.c

compat/setenv.c: error if name contains '='

2011-12-14 19:31:03 -08:00

snprintf.c

compat/snprintf: don't look at va_list twice

2011-12-12 09:09:35 -08:00

strcasestr.c

…

strlcpy.c

…

strtoimax.c

Add strtoimax() compatibility function.

2011-11-02 13:06:30 -07:00

strtok_r.c

compat: add strtok_r()

2010-08-14 19:35:38 -07:00

strtoumax.c

…

terminal.c

add generic terminal prompt function

2011-12-12 16:09:38 -08:00

terminal.h

add generic terminal prompt function

2011-12-12 16:09:38 -08:00

unsetenv.c

…

win32.h

Make usage of windows.h lean and mean

2009-09-18 20:00:42 -07:00

win32mmap.c

Fix "Out of memory? mmap failed" for files larger than 4GB on Windows

2010-05-20 16:11:06 -07:00

winansi.c

Make usage of windows.h lean and mean

2009-09-18 20:00:42 -07:00