Merge https://github.com/t-t/gitmagic