summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxLibravatar Junio C Hamano1-1/+1
2014-06-16rebase--merge: fix --skip with two conflicts in a rowLibravatar brian m. carlson1-0/+15
2010-11-11t3402: test "rebase -s<strategy> -X<opt>"Libravatar Junio C Hamano1-0/+21
2010-08-03rebase: support -X to pass through strategy optionsLibravatar Mike Lundy1-0/+9
2007-11-09rebase: operate on a detached HEADLibravatar Johannes Schindelin1-1/+6
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-6/+0
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeLibravatar Eric Wong1-0/+6
2006-06-21Add renaming-rebase test.Libravatar Junio C Hamano1-0/+106