diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:42 +0900 |
| commit | ff92463b3cdd99c59ec6fe26271617863d4d4b0c (patch) | |
| tree | c03fb4502d4f8301e09b649d61fd9ad840fc96cd /notes-merge.h | |
| parent | e293824d00c243c6a7afb15324902f693ae751e8 (diff) | |
| parent | 10d2f35436fb350c42bdb8396aee424a9bce44b5 (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
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions