summaryrefslogtreecommitdiff
path: root/t/t3418-rebase-continue.sh
AgeCommit message (Expand)Author
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano
2021-09-08tests: stop testing `git rebase --preserve-merges`Johannes Schindelin
2021-08-13rebase --continue: remove .git/MERGE_MSGPhillip Wood
2021-08-13rebase --apply: restore some testsPhillip Wood
2021-04-11rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason
2021-04-11rebase tests: camel-case rebase.rescheduleFailedExec consistentlyÆvar Arnfjörð Bjarmason
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano
2019-07-31t3418: test `rebase -r` with merge strategiesJohannes Schindelin
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin
2018-11-13Merge branch 'js/rebase-p-tests'Junio C Hamano
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin
2018-11-02t3418: decouple test cases from a previous `rebase -p` test caseJohannes Schindelin
2018-11-02Merge branch 'js/rebase-i-shortopt'Junio C Hamano
2018-11-02Merge branch 'js/rebase-i-break'Junio C Hamano
2018-10-26rebase -i: recognize short commands without argumentsJohannes Sixt
2018-10-12rebase -i: introduce the 'break' commandJohannes Schindelin
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano
2018-08-15rebase -i: fix numbering in squash messagePhillip Wood
2018-08-02Merge branch 'es/test-fixes'Junio C Hamano
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano
2018-07-16t3000-t3999: fix broken &&-chainsEric Sunshine
2018-06-27Fix use of strategy options with interactive rebasesElijah Newren
2018-06-27t3418: add testcase showing problems with rebase -i and strategy optionsElijah Newren
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano
2018-05-01rebase --skip: clean up commit message after a failed fixup/squashJohannes Schindelin
2018-05-01rebase -i: demonstrate bugs with fixup!/squash! commit messagesJohannes Schindelin
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2018-01-05rebase -p: fix quoting when calling `git merge`Johannes Schindelin
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood
2017-08-02rebase: honor --rerere-autoupdatePhillip Wood
2015-07-20t3418: non-interactive rebase --continue with rerere enabledPaul Tan
2011-12-09test: fix '&&' chainingRamkumar Ramachandra
2011-02-10rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk
2011-02-10rebase: stricter check of standalone sub commandMartin von Zweigbergk
2010-07-28Fix git rebase --continue to work with touched filesDavid D. Kilzer
generated by cgit v0.10.2-6-g49f6 at 2024-04-20 02:26:18 (GMT)