Re-fix rebase -i with SHA-1 collisions#529

dscho wants to merge 3 commits intogitgitgadget:mastergitgitgadget/git:masterfrom

dscho:re-fix-rebase-i-with-sha-collisionsdscho/git:re-fix-rebase-i-with-sha-collisionsCopy head branch name to clipboard