Merge branch 'tr/maint-doc-stash-pop' into maint

Junio C Hamano committed over 17 years ago

test-lib: fix http exit codes

Clemens Buchacher committed over 17 years ago

test-lib: allow exit trap to be used for cleanup by tests

Clemens Buchacher committed over 17 years ago

test-lib: fail if invalid options are passed

Clemens Buchacher committed over 17 years ago

grep: fix colouring of matches with zero length

René Scharfe committed over 17 years ago

refuse to merge during a merge

Clemens Buchacher committed over 17 years ago

match_refs: search ref list tail internally

Clemens Buchacher committed over 17 years ago

git-show-branch.txt: document --date-order option

Stephen Boyd committed over 17 years ago

Add custom memory allocator to MinGW and MacOS builds

Marius Storm-Olsen committed over 17 years ago

MinGW readdir reimplementation to support d_type

Marius Storm-Olsen committed over 17 years ago

connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows

Edward Z. Yang committed over 17 years ago

git: browsing paths with spaces when using the start command

Pat Thoyts committed over 17 years ago

MinGW: fix warning about implicit declaration of _getch()

Johannes Schindelin committed over 17 years ago

test-chmtime: work around Windows limitation

Johannes Schindelin committed over 17 years ago

Work around a regression in Windows 7, causing erase_in_line() to crash sometimes

Johannes Schindelin committed over 17 years ago

Quiet make: do not leave Windows behind

Johannes Schindelin committed over 17 years ago

MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore

Johannes Schindelin committed over 17 years ago

diff: generate pretty filenames in prep_temp_blob()

David Aguilar committed over 17 years ago

compat: add a basename() compatibility function

David Aguilar committed over 17 years ago

compat: add a mkstemps() compatibility function

David Aguilar committed over 17 years ago