summaryrefslogtreecommitdiff
path: root/t/t3418-rebase-continue.sh
Commit message (Expand)AuthorAgeFilesLines
* 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-021-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-021-0/+3
* rebase: honor --rerere-autoupdatePhillip Wood2017-08-021-27/+55
* t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-201-0/+19
* test: fix '&&' chainingRamkumar Ramachandra2011-12-081-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
* rebase: stricter check of standalone sub commandMartin von Zweigbergk2011-02-101-0/+5
* Fix git rebase --continue to work with touched filesDavid D. Kilzer2010-07-281-0/+43
View Lorry Controller Status