path: root/t/
AgeCommit message (Expand)Author
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin
2013-08-21rebase --preserve-merges: ignore "merge.log" configRalf Thielow
2013-06-07add tests for rebasing merged historyMartin von Zweigbergk
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong preserve-merges fails on merges created with no-ffAndrew Wong
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy
2010-09-09tests: subshell indentation stylefixJonathan Nieder
2010-09-06Several tests: cd inside subshell instead of aroundJens Lehmann
2009-11-30t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie
2009-08-09merge: indicate remote tracking branches in merge messageJeff King
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt
2008-12-21Show a failure of rebase -p if the merge had a conflictJohannes Sixt
2008-09-30rebase: Support preserving merges in non-interactive modeAndreas Ericsson