]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44275f5 d559f50)
Merge branch 'pw/rebase-abort-clean-rewritten'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:41 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:41 +0000 (15:25 -0700)
commit88f95e49afe2684da7e8074d7782eba396604bdb
treeea9b4baa420118c64640dd0d23e403fdc797e613tree | snapshot
parent44275f5e1bef37304f5a9da65b588e344eb00a72commit | diff
parentd559f502c59658ea1f360fd28d8909894e40a4fecommit | diff
Merge branch 'pw/rebase-abort-clean-rewritten'

"git rebase --abort" used to leave refs/rewritten/ when concluding
"git rebase -r", which has been corrected.

* pw/rebase-abort-clean-rewritten:
  rebase --abort/--quit: cleanup refs/rewritten
  sequencer: return errors from sequencer_remove_state()
  rebase: warn if state directory cannot be removed
  rebase: fix a memory leak
builtin/rebase.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
t/t3430-rebase-merges.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.