summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
AgeCommit message (Expand)AuthorFilesLines
2009-11-29t3409 t4107 t7406 t9150: use dashless commandsLibravatar Matthew Ogilvie1-3/+3
2009-08-09merge: indicate remote tracking branches in merge messageLibravatar Jeff King1-1/+1
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneLibravatar Johannes Schindelin1-0/+1
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneLibravatar Johannes Sixt1-1/+1
2008-12-21Show a failure of rebase -p if the merge had a conflictLibravatar Johannes Sixt1-11/+44
2008-09-30rebase: Support preserving merges in non-interactive modeLibravatar Andreas Ericsson1-0/+61