summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
AgeCommit message (Expand)Author
2018-07-16t3000-t3999: fix broken &&-chainsEric Sunshine
2016-04-24git-rebase--merge: don't include absent parent as a baseBen Woosley
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2014-06-16rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson
2010-11-11t3402: test "rebase -s<strategy> -X<opt>"Junio C Hamano
2010-08-03rebase: support -X to pass through strategy optionsMike Lundy
2007-11-09rebase: operate on a detached HEADJohannes Schindelin
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeEric Wong
2006-06-21Add renaming-rebase test.Junio C Hamano