Simple tools for incrementativelly merging Git changesets