merge

VirtusLab / Git Machete

Probably the sharpest git repository organizer & rebase/merge workflow automation tool you've ever