aboutsummaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
Commit message (Expand)AuthorAge
* rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson2014-06-16
* t3402: test "rebase -s<strategy> -X<opt>"Junio C Hamano2010-11-11
* rebase: support -X to pass through strategy optionsMike Lundy2010-08-03
* rebase: operate on a detached HEADJohannes Schindelin2007-11-09
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-21
* Add renaming-rebase test.Junio C Hamano2006-06-21