Fixes for root rewriting
Order of branches passed on command line influences order they show up in interactive rebase. Broke some tests though