summaryrefslogtreecommitdiff
path: root/t/t3418-rebase-continue.sh
AgeCommit message (Expand)AuthorFilesLines
2019-09-18Merge branch 'js/rebase-r-strategy'Libravatar Junio C Hamano1-0/+14
2019-07-31t3418: test `rebase -r` with merge strategiesLibravatar Johannes Schindelin1-0/+14
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecLibravatar Johannes Schindelin1-0/+8
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Libravatar Johannes Schindelin1-3/+0
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execLibravatar Johannes Schindelin1-0/+3
2018-12-11rebase: add a config option to default to --reschedule-failed-execLibravatar Johannes Schindelin1-1/+6
2018-12-11rebase: introduce --reschedule-failed-execLibravatar Johannes Schindelin1-0/+6
2018-11-13Merge branch 'js/rebase-p-tests'Libravatar Junio C Hamano1-2/+3
2018-11-02tests: optionally skip `git rebase -p` testsLibravatar Johannes Schindelin1-2/+2
2018-11-02t3418: decouple test cases from a previous `rebase -p` test caseLibravatar Johannes Schindelin1-0/+1
2018-11-02Merge branch 'js/rebase-i-shortopt'Libravatar Junio C Hamano1-1/+3
2018-11-02Merge branch 'js/rebase-i-break'Libravatar Junio C Hamano1-0/+9
2018-10-26rebase -i: recognize short commands without argumentsLibravatar Johannes Sixt1-1/+3
2018-10-12rebase -i: introduce the 'break' commandLibravatar Johannes Schindelin1-0/+9
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Libravatar Junio C Hamano1-1/+3
2018-08-15rebase -i: fix numbering in squash messageLibravatar Phillip Wood1-1/+3
2018-08-02Merge branch 'es/test-fixes'Libravatar Junio C Hamano1-2/+2
2018-07-18Merge branch 'en/rebase-i-microfixes'Libravatar Junio C Hamano1-0/+32
2018-07-16t3000-t3999: fix broken &&-chainsLibravatar Eric Sunshine1-2/+2
2018-06-27Fix use of strategy options with interactive rebasesLibravatar Elijah Newren1-1/+1
2018-06-27t3418: add testcase showing problems with rebase -i and strategy optionsLibravatar Elijah Newren1-0/+32
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Libravatar Junio C Hamano1-0/+49
2018-05-02rebase --skip: clean up commit message after a failed fixup/squashLibravatar Johannes Schindelin1-4/+31
2018-05-02rebase -i: demonstrate bugs with fixup!/squash! commit messagesLibravatar Johannes Schindelin1-0/+22
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-01-05rebase -p: fix quoting when calling `git merge`Libravatar Johannes Schindelin1-0/+14
2017-08-02rebase -i: honor --rerere-autoupdateLibravatar Phillip Wood1-0/+3
2017-08-02rebase: honor --rerere-autoupdateLibravatar Phillip Wood1-27/+55
2015-07-20t3418: non-interactive rebase --continue with rerere enabledLibravatar Paul Tan1-0/+19
2011-12-08test: fix '&&' chainingLibravatar Ramkumar Ramachandra1-2/+2
2011-02-10rebase -m: remember allow_rerere_autoupdate optionLibravatar Martin von Zweigbergk1-0/+21
2011-02-10rebase: remember strategy and strategy optionsLibravatar Martin von Zweigbergk1-0/+29
2011-02-10rebase: stricter check of standalone sub commandLibravatar Martin von Zweigbergk1-0/+5
2010-07-28Fix git rebase --continue to work with touched filesLibravatar David D. Kilzer1-0/+43
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:29:20 +0000