merge: drop 'git merge <message> HEAD <commit>' syntax

Junio C Hamano committed over 11 years ago

merge: deprecate 'git merge <message> HEAD <commit>' syntax

Junio C Hamano committed over 11 years ago

merge: handle FETCH_HEAD internally

Junio C Hamano committed over 11 years ago

merge: decide if we auto-generate the message early in collect_parents()

Junio C Hamano committed over 11 years ago

merge: make collect_parents() auto-generate the merge message

Junio C Hamano committed over 11 years ago

merge: extract prepare_merge_message() logic out

Junio C Hamano committed over 11 years ago

merge: narrow scope of merge_names

Junio C Hamano committed over 11 years ago

merge: split reduce_parents() out of collect_parents()

Junio C Hamano committed over 11 years ago

merge: clarify collect_parents() logic

Junio C Hamano committed over 11 years ago

merge: small leakfix and code simplification

Junio C Hamano committed over 11 years ago

merge: do not check argc to determine number of remote heads

Junio C Hamano committed over 11 years ago

merge: clarify "pulling into void" special case

Junio C Hamano committed over 11 years ago

t5520: test pulling an octopus into an unborn branch

Junio C Hamano committed over 11 years ago

t5520: style fixes

Junio C Hamano committed over 11 years ago

merge: simplify code flow

Junio C Hamano committed over 11 years ago

merge: test the top-level merge driver

Junio C Hamano committed over 11 years ago

filter-branch: avoid passing commit message through sed

Jeff King committed over 11 years ago

rebase -i: redo tasks that die during cherry-pick

Phil Hord committed over 11 years ago

test-lib: turn on GIT_TEST_CHAIN_LINT by default

Jeff King committed over 11 years ago

t7502-commit.sh: fix a broken and-chain

Ramsay Jones committed over 11 years ago