diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
| commit | 3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc (patch) | |
| tree | 9fd86e666b7c013395c535607130a3027aa3f54a /builtin/rebase.c | |
| parent | Merge branch 'dl/merge-autostash' (diff) | |
| parent | rebase: save autostash entry into stash reflog on --quit (diff) | |
| download | tgif-3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc.tar.xz | |
Merge branch 'dl/merge-autostash-rebase-quit-fix'
The stash entry created by "git rebase --autosquash" to keep the
initial dirty state were discarded by mistake upon "git rebase
--quit", which has been corrected.
* dl/merge-autostash-rebase-quit-fix:
rebase: save autostash entry into stash reflog on --quit
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 6e9ab2a71f..1c0a49c642 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1566,6 +1566,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) goto cleanup; } case ACTION_QUIT: { + save_autostash(state_dir_path("autostash", &options)); if (options.type == REBASE_MERGE) { struct replay_opts replay = REPLAY_OPTS_INIT; |