Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.2' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.1' into maint-1.6.2

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

apply: handle filenames with double slashes better

Michal Marek committed over 17 years ago

More to-do items based on feedback

Avery Pennarun committed over 17 years ago

mergetool--lib: add support for araxis merge

David Aguilar committed over 17 years ago

http-push.c::remove_locks(): fix use after free

Alex Riesen committed over 17 years ago

t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C

Nguyễn Thái Ngọc Duy committed over 17 years ago

grep: fix word-regexp at the beginning of lines

René Scharfe committed over 17 years ago

apply, fmt-merge-msg: use relative filenames

Stephen Boyd committed over 17 years ago

commit: -F overrides -t

Stephen Boyd committed over 17 years ago

post-receive-email: hooks.showrev: show how to include both web link and patch

Jim Meyering committed over 17 years ago

MinGW: Fix compiler warning in merge-recursive

Johannes Schindelin committed over 17 years ago

MinGW: Add a simple getpass()

Johannes Schindelin committed over 17 years ago

MinGW: use POSIX signature of waitpid()

Johannes Schindelin committed over 17 years ago

MinGW: the path separator to split GITPERLLIB is ';' on Win32

Johannes Schindelin committed over 17 years ago

MinGW: Scan for \r in addition to \n when reading shbang lines

Peter Harris committed over 17 years ago

Merge branch 'jn/gitweb-cleanup'

Junio C Hamano committed over 17 years ago

Merge branch 'mg/track'

Junio C Hamano committed over 17 years ago