summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19t34*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-6/+6
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2018-11-02tests: optionally skip `git rebase -p` testsLibravatar Johannes Schindelin1-0/+5
2013-08-21rebase --preserve-merges: ignore "merge.log" configLibravatar Ralf Thielow1-0/+23
2013-06-07add tests for rebasing merged historyLibravatar Martin von Zweigbergk1-53/+0
2011-06-19rebase -i -p: include non-first-parent commits in todo listLibravatar Andrew Wong1-1/+27
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong1-1/+31
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy1-1/+1
2010-09-09tests: subshell indentation stylefixLibravatar Jonathan Nieder1-6/+7
2010-09-06Several tests: cd inside subshell instead of aroundLibravatar Jens Lehmann1-6/+6
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