Merge branch 'maint'

Junio C Hamano committed over 17 years ago

git submodule: fix usage line

Julien Danjou committed over 17 years ago

Merge branch 'maint-1.6.1' into maint

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

doc/git-pack-refs: fix two grammar issues

Markus Heidelberg committed over 17 years ago

tests: remove exit after test_done call

Jeff King committed over 17 years ago

commit: abort commit if interactive add failed

Jeff King committed over 17 years ago

simplify output of conflicting merge

Clemens Buchacher committed over 17 years ago

update cache for conflicting submodule entries

Clemens Buchacher committed over 17 years ago

add tests for merging with submodules

Clemens Buchacher committed over 17 years ago

bisect: improve error message when branch checkout fails

Christian Couder committed over 17 years ago

git-repack: use non-dashed update-server-info

Dan McGee committed over 17 years ago

add --html-path to get the location of installed HTML docs

Markus Heidelberg committed over 17 years ago

Merge branch 'cc/sha1-bsearch' into HEAD

Junio C Hamano committed over 17 years ago

patch-ids: use the new generic "sha1_pos" function to lookup sha1

Christian Couder committed over 17 years ago

sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1

Christian Couder committed over 17 years ago

send-email: fix nasty bug in ask() function

Jay Soffian committed over 17 years ago

Update draft release notes to 1.6.3

Junio C Hamano committed over 17 years ago

Fix 'git checkout <submodule>' to update the index

Johannes Schindelin committed over 17 years ago

Allow curl to rewind the read buffers

Martin Storsjö committed over 17 years ago