summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-291-1/+1
* rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-0/+15
* t3402: test "rebase -s<strategy> -X<opt>"Junio C Hamano2010-11-111-0/+21
* rebase: support -X to pass through strategy optionsMike Lundy2010-08-031-0/+9
* rebase: operate on a detached HEADJohannes Schindelin2007-11-091-1/+6
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-271-6/+0
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-211-0/+6
* Add renaming-rebase test.Junio C Hamano2006-06-211-0/+106