aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3418-rebase-continue.sh
AgeCommit message (Expand)AuthorFilesLines
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-3/+3
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-3/+3
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano1-0/+18
2023-09-06rebase -i: remove patch file after conflict resolutionPhillip Wood1-0/+18
2023-08-03rebase --skip: fix commit message clean up when skipping squashPhillip Wood1-17/+41
2023-04-10rebase: remove a couple of redundant strategy testsPhillip Wood1-32/+0
2023-04-10rebase -m: fix serialization of strategy optionsPhillip Wood1-12/+22
2022-01-26rebase --apply: set ORIG_HEAD correctlyPhillip Wood1-0/+26
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-15/+0
2021-09-07tests: stop testing `git rebase --preserve-merges`Johannes Schindelin1-15/+0
2021-08-13rebase --continue: remove .git/MERGE_MSGPhillip Wood1-0/+10
2021-08-13rebase --apply: restore some testsPhillip Wood1-4/+4
2021-04-10rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason1-0/+23
2021-04-10rebase tests: camel-case rebase.rescheduleFailedExec consistentlyÆvar Arnfjörð Bjarmason1-2/+2
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin1-13/+13
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano1-0/+14
2019-07-31t3418: test `rebase -r` with merge strategiesJohannes Schindelin1-0/+14
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin1-0/+8
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin1-3/+0
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin1-0/+3
2018-12-11rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin1-1/+6
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin1-0/+6
2018-11-13Merge branch 'js/rebase-p-tests'Junio C Hamano1-2/+3
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin1-2/+2
2018-11-02t3418: decouple test cases from a previous `rebase -p` test caseJohannes Schindelin1-0/+1
2018-11-02Merge branch 'js/rebase-i-shortopt'Junio C Hamano1-1/+3
2018-11-02Merge branch 'js/rebase-i-break'Junio C Hamano1-0/+9
2018-10-26rebase -i: recognize short commands without argumentsJohannes Sixt1-1/+3
2018-10-12rebase -i: introduce the 'break' commandJohannes Schindelin1-0/+9
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano1-1/+3
2018-08-15rebase -i: fix numbering in squash messagePhillip Wood1-1/+3
2018-08-02Merge branch 'es/test-fixes'Junio C Hamano1-2/+2
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano1-0/+32
2018-07-16t3000-t3999: fix broken &&-chainsEric Sunshine1-2/+2
2018-06-27Fix use of strategy options with interactive rebasesElijah Newren1-1/+1
2018-06-27t3418: add testcase showing problems with rebase -i and strategy optionsElijah Newren1-0/+32
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano1-0/+49
2018-05-02rebase --skip: clean up commit message after a failed fixup/squashJohannes Schindelin1-4/+31
2018-05-02rebase -i: demonstrate bugs with fixup!/squash! commit messagesJohannes Schindelin1-0/+22
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy1-2/+2
2018-01-05rebase -p: fix quoting when calling `git merge`Johannes Schindelin1-0/+14
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood1-0/+3
2017-08-02rebase: honor --rerere-autoupdatePhillip Wood1-27/+55
2015-07-20t3418: non-interactive rebase --continue with rerere enabledPaul Tan1-0/+19
2011-12-08test: fix '&&' chainingRamkumar Ramachandra1-2/+2
2011-02-10rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk1-0/+21
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk1-0/+29
2011-02-10rebase: stricter check of standalone sub commandMartin von Zweigbergk1-0/+5
2010-07-28Fix git rebase --continue to work with touched filesDavid D. Kilzer1-0/+43
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 19:18:28 +0000