summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-04-28 05:31:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-28 12:35:38 -0700
commit9b2df3e8d093145f1628af82b94f6dcfc85b9646 (patch)
treec804fc971189f0da9df34f104360002720c9d64d /.travis.yml
parentpull: pass --autostash to merge (diff)
downloadtgif-9b2df3e8d093145f1628af82b94f6dcfc85b9646.tar.xz
rebase: save autostash entry into stash reflog on --quit
In a03b55530a (merge: teach --autostash option, 2020-04-07), the --autostash option was introduced for `git merge`. Notably, when `git merge --quit` is run with an autostash entry present, it is saved into the stash reflog. This is contrasted with the current behaviour of `git rebase --quit` where the autostash entry is simply just dropped out of existence. Adopt the behaviour of `git merge --quit` in `git rebase --quit` and save the autostash entry into the stash reflog instead of just deleting it. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions