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 /notes-merge.h | |
| 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 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions