Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

make "git hash-object" a built-in

Linus Torvalds committed almost 17 years ago

make "git merge-tree" a built-in

Linus Torvalds committed almost 17 years ago

slim down "git show-index"

Linus Torvalds committed almost 17 years ago

Remove diff machinery dependency from read-cache

Linus Torvalds committed almost 17 years ago

merge-recursive: do not return NULL only to cause segfault

Junio C Hamano committed almost 17 years ago

git-rebase.txt: Fix spelling

Horst H. von Brand committed almost 17 years ago

retry request without query when info/refs?query fails

Tay Ray Chuan committed almost 17 years ago

Fix "log --oneline" not to show notes

Junio C Hamano committed almost 17 years ago

Make 'rerere forget' work from a subdirectory.

Johannes Sixt committed almost 17 years ago

Make test case numbers unique

Johannes Sixt committed almost 17 years ago

conflict-marker-size: add test and docs

Junio C Hamano committed almost 17 years ago

Update draft release notes to 1.7.0

Junio C Hamano committed almost 17 years ago

Merge branch 'bw/cvsimport'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/checkout-merge-base'

Junio C Hamano committed almost 17 years ago

Merge branch 'ag/patch-header-verify'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/conflict-marker-size'

Junio C Hamano committed almost 17 years ago

Merge branch 'ag/maint-apply-too-large-p'

Junio C Hamano committed almost 17 years ago

Merge branch 'ap/merge-backend-opts'

Junio C Hamano committed almost 17 years ago

Merge branch 'nd/status-partial-refresh'

Junio C Hamano committed almost 17 years ago