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

Merge remote branch 'remotes/trast-doc/for-next'

Junio C Hamano committed almost 17 years ago

Merge branch 'jh/notes' (early part)

Junio C Hamano committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint

Junio C Hamano committed almost 17 years ago

Fix memory corruption when .gitignore does not end by \n

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

Fix "log" family not to be too agressive about showing notes

Junio C Hamano committed almost 17 years ago

Merge branch 'rr/core-tutorial'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/cache-unmerge'

Junio C Hamano committed almost 17 years ago

Merge branch 'js/exec-error-report'

Junio C Hamano committed almost 17 years ago