Merge branch 'maint-1.6.5' into maint-1.6.6

Junio C Hamano committed over 16 years ago

request-pull.txt: Document -p option

Stephen Boyd committed over 16 years ago

Merge branch 'maint-1.6.4' into maint-1.6.5

Junio C Hamano committed over 16 years ago

Check size of path buffer before writing into it

Greg Brockman committed over 16 years ago

blame: use find_commit_subject() instead of custom code

Christian Couder committed over 16 years ago

merge-recursive: use find_commit_subject() instead of custom code

Christian Couder committed over 16 years ago

bisect: use find_commit_subject() instead of custom code

Christian Couder committed over 16 years ago

revert: rename variables related to subject in get_message()

Christian Couder committed over 16 years ago

revert: refactor code to find commit subject in find_commit_subject()

Christian Couder committed over 16 years ago

revert: fix off by one read when searching the end of a commit subject

Christian Couder committed over 16 years ago

t3508: add check_head_differs_from() helper function and use it

Christian Couder committed over 16 years ago

rebase: protect against diff.renames configuration

Junio C Hamano committed about 18 years ago

t3400 (rebase): whitespace cleanup

Jonathan Nieder committed over 16 years ago

Teach "apply --index-info" to handle rename patches

Junio C Hamano committed about 18 years ago

t4150 (am): futureproof against failing tests

Jonathan Nieder committed over 16 years ago

t4150 (am): style fix

Jonathan Nieder committed over 16 years ago

git-instaweb: Don't assume Apache executable is named apache2

Dan McGee committed over 16 years ago

git-instaweb: Fix Apache environment variable passing

Dan McGee committed over 16 years ago

git-instaweb: Fix custom apache log placement

Dan McGee committed over 16 years ago

Git 1.7.2

Junio C Hamano committed over 16 years ago