Update draft release notes to 1.7.0

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/test-locate-httpd'

Junio C Hamano committed almost 17 years ago

Merge branch 'jh/commit-status'

Junio C Hamano committed almost 17 years ago

Merge branch 'jn/makefile'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/clone-v-progress'

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/smart-http-restrict'

Junio C Hamano committed almost 17 years ago

Merge branch 'jk/run-command-use-shell'

Junio C Hamano committed almost 17 years ago

Merge branch 'sr/gfi-options'

Junio C Hamano committed almost 17 years ago

git status: Show uncommitted submodule changes too when enabled

Jens Lehmann committed almost 17 years ago

Update COPYING with GPLv2 with new FSF address

Junio C Hamano committed almost 17 years ago

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

Junio C Hamano committed almost 17 years ago

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

Junio C Hamano committed almost 17 years ago

rerere: honor conflict-marker-size attribute

Junio C Hamano committed almost 17 years ago

rerere: prepare for customizable conflict marker length

Junio C Hamano committed almost 17 years ago

commit.c::print_summary: do not release the format string too early

Junio C Hamano committed almost 17 years ago

conflict-marker-size: new attribute

Junio C Hamano committed almost 17 years ago

rerere: use ll_merge() instead of using xdl_merge()

Junio C Hamano committed almost 17 years ago

merge-tree: use ll_merge() not xdl_merge()

Junio C Hamano committed almost 17 years ago

xdl_merge(): allow passing down marker_size in xmparam_t

Junio C Hamano committed almost 17 years ago