summaryrefslogtreecommitdiffstats
path: root/t/t3420-rebase-autostash.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 buildJunio 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 fixesVille Skyttä2016-08-111-2/+2
* rebase -i: restore autostash on abortPatrick Steinhardt2016-06-291-0/+31
* rebase: support --no-autostashJohn Keeping2015-09-111-0/+10
* rebase -i: test "Nothing to do" case with autostashMatthieu Moy2014-05-201-0/+15
* rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-141-0/+11
* rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-141-0/+11
* rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-0/+148