summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
Commit message (Expand)AuthorAgeFilesLines
* Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-211-11/+44
* rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-301-0/+61