diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:45 -0700 |
| commit | 87ae8a1a950da28a2f75570ecaecbc9cd439c64c (patch) | |
| tree | af7f39996045d70dd099d95a4d09683d420df800 /userdiff.c | |
| parent | 150f307afc13961b0322ad0e7205a7b193368586 (diff) | |
| parent | 10d2f35436fb350c42bdb8396aee424a9bce44b5 (diff) | |
| download | git-87ae8a1a950da28a2f75570ecaecbc9cd439c64c.tar.xz | |
Merge branch 'js/rebase-i-autosquash-fix'
"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 'userdiff.c')
0 files changed, 0 insertions, 0 deletions