]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf10200 9b2df3e)
Merge branch 'dl/merge-autostash-rebase-quit-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2020 23:15:27 +0000 (16:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2020 23:15:27 +0000 (16:15 -0700)
commit3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc
tree9fd86e666b7c013395c535607130a3027aa3f54atree | snapshot
parentbf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7commit | diff
parent9b2df3e8d093145f1628af82b94f6dcfc85b9646commit | diff
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
Documentation/git-rebase.txt diff1 | diff2 | blob | history
builtin/rebase.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.