summaryrefslogtreecommitdiff
path: root/t/t3420-rebase-autostash.sh
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.30.6Taylor Blau2022-10-061-1/+1
|\
| * t/t3NNN: allow local submodulesTaylor Blau2022-10-011-1/+1
* | tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-2/+2
* | t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-5/+5
* | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
|/
* rebase: save autostash entry into stash reflog on --quitDenton Liu2020-04-281-0/+20
* rebase: rename the two primary rebase backendsElijah Newren2020-02-161-11/+11
* rebase tests: mark tests specific to the am-backend with --amElijah Newren2020-02-161-1/+1
* builtin/rebase.c: Remove pointless messageBen Wijen2019-09-071-4/+0
* builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen2019-09-071-0/+8
* t3420: remove progress lines before comparing outputPhillip Wood2019-07-081-8/+11
* rebase: fix garbled progress display with '-x'SZEDER Gábor2019-06-271-2/+2
* rebase: implement --merge via the interactive machineryElijah Newren2019-01-071-72/+6
* Merge branch 'js/rebase-autostash-detach-fix'Junio C Hamano2018-11-181-0/+8
|\
| * built-in rebase --autostash: leave the current branch alone if possibleJohannes Schindelin2018-11-081-1/+1
| * built-in rebase: demonstrate regression with --autostashJohannes Schindelin2018-11-081-0/+8
* | Merge branch 'js/rebase-autostash-fix'Junio C Hamano2018-11-021-0/+10
|\ \ | |/
| * rebase --autostash: fix issue with dirty submodulesJohannes Schindelin2018-10-241-1/+1
| * rebase --autostash: demonstrate a problem with dirty submodulesJohannes Schindelin2018-10-241-0/+10
* | t3420-rebase-autostash: don't try to grep non-existing filesSZEDER Gábor2018-08-221-4/+4
|/
* t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-testsJunio C Hamano2017-06-231-2/+2
* rebase: add more regression tests for console outputPhillip Wood2017-06-191-2/+69
* rebase: add regression tests for console outputPhillip Wood2017-06-191-3/+64
* Spelling fixesvs/typofixVille Skyttä2016-08-111-2/+2
* rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abortPatrick Steinhardt2016-06-291-0/+31
* rebase: support --no-autostashJohn Keeping2015-09-101-0/+10
* rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
* rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-131-0/+11
* rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-131-0/+11
* rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-0/+148
View Lorry Controller Status