aboutsummaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
Commit message (Expand)AuthorAge
* rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-24
* rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-21
* Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-21
* rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-30