]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
rebase: save autostash entry into stash reflog on --quit
authorDenton Liu <liu.denton@gmail.com>
Tue, 28 Apr 2020 09:31:31 +0000 (05:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 19:35:38 +0000 (12:35 -0700)
commit9b2df3e8d093145f1628af82b94f6dcfc85b9646
treec804fc971189f0da9df34f104360002720c9d64d
parentd9f15d37f1a545305988f6b2bb40de1fbf0049cf
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>
Documentation/git-rebase.txt
builtin/rebase.c
t/t3420-rebase-autostash.sh