projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e293824 10d2f35)
Merge branch 'js/rebase-i-autosquash-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:42 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:42 +0000 (22:57 +0900)
commitff92463b3cdd99c59ec6fe26271617863d4d4b0c
treec03fb4502d4f8301e09b649d61fd9ad840fc96cdtree | snapshot
parente293824d00c243c6a7afb15324902f693ae751e8commit | diff
parent10d2f35436fb350c42bdb8396aee424a9bce44b5commit | diff
Merge branch 'js/rebase-i-autosquash-fix' into maint

"git rebase -i" did not clear the state files correctly when a run
of "squash/fixup" is aborted and then the user manually amended the
commit instead, which has been corrected.

* js/rebase-i-autosquash-fix:
  rebase -i: be careful to wrap up fixup/squash chains
  rebase -i --autosquash: demonstrate a problem skipping the last squash
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.