summaryrefslogtreecommitdiffstats
path: root/t/t3418-rebase-continue.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* sequencer: fix memory leaks in `make_script_with_merges()`Patrick Steinhardt2024-06-111-0/+1
* Merge branch 'jc/test-i18ngrep'Junio C Hamano2023-11-081-3/+3
|\
| * tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-3/+3
* | Merge branch 'pw/rebase-i-after-failure'Junio C Hamano2023-09-141-0/+18
|\ \ | |/ |/|
| * rebase -i: remove patch file after conflict resolutionPhillip Wood2023-09-061-0/+18
* | rebase --skip: fix commit message clean up when skipping squashPhillip Wood2023-08-031-17/+41
|/
* rebase: remove a couple of redundant strategy testsPhillip Wood2023-04-101-32/+0
* rebase -m: fix serialization of strategy optionsPhillip Wood2023-04-101-12/+22
* rebase --apply: set ORIG_HEAD correctlyPhillip Wood2022-01-261-0/+26
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-191-15/+0
|\
| * tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-081-15/+0
* | rebase --continue: remove .git/MERGE_MSGPhillip Wood2021-08-131-0/+10
* | rebase --apply: restore some testsPhillip Wood2021-08-131-4/+4
|/
* rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason2021-04-111-0/+23
* rebase tests: camel-case rebase.rescheduleFailedExec consistentlyÆvar Arnfjörð Bjarmason2021-04-111-2/+2
* t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-13/+13
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-181-0/+14
|\
| * t3418: test `rebase -r` with merge strategiesJohannes Schindelin2019-07-311-0/+14
* | rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin2019-07-011-0/+8
|/
* Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-3/+0
* rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin2018-12-111-0/+3
* rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin2018-12-111-1/+6
* rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-111-0/+6
* Merge branch 'js/rebase-p-tests'Junio C Hamano2018-11-131-2/+3
|\
| * tests: optionally skip `git rebase -p` testsJohannes Schindelin2018-11-021-2/+2
| * t3418: decouple test cases from a previous `rebase -p` test caseJohannes Schindelin2018-11-021-0/+1
* | Merge branch 'js/rebase-i-shortopt'Junio C Hamano2018-11-021-1/+3
|\ \
| * | rebase -i: recognize short commands without argumentsJohannes Sixt2018-10-261-1/+3
* | | Merge branch 'js/rebase-i-break'Junio C Hamano2018-11-021-0/+9
|\| | | |/ |/|
| * rebase -i: introduce the 'break' commandJohannes Schindelin2018-10-121-0/+9
* | Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano2018-08-201-1/+3
|\ \
| * | rebase -i: fix numbering in squash messagePhillip Wood2018-08-151-1/+3
* | | Merge branch 'es/test-fixes'Junio C Hamano2018-08-031-2/+2
|\ \ \ | |_|/ |/| |
| * | t3000-t3999: fix broken &&-chainsEric Sunshine2018-07-161-2/+2
* | | Merge branch 'en/rebase-i-microfixes'Junio C Hamano2018-07-181-0/+32
|\ \ \ | |/ / |/| |
| * | Fix use of strategy options with interactive rebasesElijah Newren2018-06-271-1/+1
| * | t3418: add testcase showing problems with rebase -i and strategy optionsElijah Newren2018-06-271-0/+32
* | | Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano2018-05-231-0/+49
|\ \ \ | | |/ | |/|
| * | rebase --skip: clean up commit message after a failed fixup/squashJohannes Schindelin2018-05-021-4/+31
| * | rebase -i: demonstrate bugs with fixup!/squash! commit messagesJohannes Schindelin2018-05-021-0/+22
| |/
* / t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy2018-03-271-2/+2
|/
* rebase -p: fix quoting when calling `git merge`Johannes Schindelin2018-01-051-0/+14
* rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-031-0/+3
* rebase: honor --rerere-autoupdatePhillip Wood2017-08-031-27/+55
* t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-201-0/+19
* test: fix '&&' chainingRamkumar Ramachandra2011-12-091-2/+2
* rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-101-0/+21
* rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-101-0/+29
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 08:36:07 +0100