Small helpers for using git
Rebase gradually: replay branch commits over newer commits on target branch, to handle the conflicts in smaller units.
See post: Break big merges to smaller pieces
A merging variant of sub-rebase.sh
A tool to normalize line endings to reduce diffs. It may normalize line endings to either '\n' (unix) or '\r\n' (windows) depending on which one best reduces the diff size.
A tool to avoid recloning submodules that are repeated across different repositories.