chiark / gitweb /
git-debrebase: merge: Do wreckage cleaning separately
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:13:41 +0000 (20:13 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:13:41 +0000 (20:13 +0100)
commit186b386b3adc95b515109a430cad3d82b4d637dd
tree81ddd3e08b52286bddd85408d726b610dc8c9b85
parent612dca82a7f17f88835f495155fe3ff1502e336c
git-debrebase: merge: Do wreckage cleaning separately

git-update-ref hates us if we delete a ref and reintroduce it, in the
same transaction.  In this case we don't mind doing it in two goes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase