summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-071-130/+0
* t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-6/+6
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* tests: optionally skip `git rebase -p` testsJohannes Schindelin2018-11-021-0/+5
* rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-211-0/+23
* add tests for rebasing merged historyMartin von Zweigbergk2013-06-071-53/+0
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-191-1/+27
* git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-281-1/+31
* Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-1/+1
* tests: subshell indentation stylefixJonathan Nieder2010-09-091-6/+7
* Several tests: cd inside subshell instead of aroundJens Lehmann2010-09-061-6/+6
* t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie2009-11-291-3/+3
* merge: indicate remote tracking branches in merge messageJeff King2009-08-091-1/+1
* 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
View Lorry Controller Status