Merge branch 'fc/maint-format-patch-pathspec-dashes'

Junio C Hamano committed almost 17 years ago

Merge branch 'mm/maint-merge-ff-error-message-fix'

Junio C Hamano committed almost 17 years ago

Merge branch 'ap/maint-merge-strategy-list-fix'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/pretty-lf'

Junio C Hamano committed almost 17 years ago

Merge branch 'cc/bisect-doc'

Junio C Hamano committed almost 17 years ago

Merge branch 'em/commit-claim'

Junio C Hamano committed almost 17 years ago

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