summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19t34*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-23/+23
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-0/+77
2018-07-16t3000-t3999: fix broken &&-chainsLibravatar Eric Sunshine1-2/+2
2016-04-24git-rebase--merge: don't include absent parent as a baseLibravatar Ben Woosley1-0/+9
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