]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 150f307 10d2f35)
Merge branch 'js/rebase-i-autosquash-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:45 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:45 +0000 (10:30 -0700)
commit87ae8a1a950da28a2f75570ecaecbc9cd439c64c
treeaf7f39996045d70dd099d95a4d09683d420df800tree | snapshot
parent150f307afc13961b0322ad0e7205a7b193368586commit | diff
parent10d2f35436fb350c42bdb8396aee424a9bce44b5commit | diff
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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.