summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-241-0/+1
* rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-211-1/+1
* 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