Merge branch 'jc/mailinfo-remove-brackets'

Junio C Hamano committed almost 17 years ago

Merge branch 'fc/send-email-envelope'

Junio C Hamano committed almost 17 years ago

Merge branch 'uk/maint-shortlog-encoding'

Junio C Hamano committed almost 17 years ago

Merge branch 'ns/send-email-no-chain-reply-to'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-am-keep'

Junio C Hamano committed almost 17 years ago

Merge branch 'bw/diff-color-hunk-header'

Junio C Hamano committed almost 17 years ago

Documentation: Document --branch option in git clone synopsis

David Soria Parra committed almost 17 years ago

builtin-merge: show user-friendly error messages for fast-forward too.

Matthieu Moy committed almost 17 years ago

merge-recursive: make the error-message generation an extern function

Matthieu Moy committed almost 17 years ago

git-merge-file --ours, --theirs

Junio C Hamano committed over 18 years ago

Merge remote branch 'ko/master' into HEAD

Junio C Hamano committed almost 17 years ago

t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH

Matthew Ogilvie committed almost 17 years ago

t3409 t4107 t7406 t9150: use dashless commands

Matthew Ogilvie committed almost 17 years ago

builtin-merge.c: call exclude_cmds() correctly.

Avery Pennarun committed almost 17 years ago

t2300: use documented technique to invoke git-sh-setup

Matthew Ogilvie committed almost 17 years ago

prepare send-email for smoother change of --chain-reply-to default

Nanako Shiraishi committed almost 17 years ago

Update draft release notes to 1.6.6 before merging topics for -rc1

Junio C Hamano committed almost 17 years ago

Makefile: do not clean arm directory

Jonathan Nieder committed almost 17 years ago

Give the hunk comment its own color

Bert Wesarg committed almost 17 years ago

send-email: automatic envelope sender

Felipe Contreras committed almost 17 years ago