git-imerge
Incremental merge for git.
I’m not sure I quite see the value in this beyond that given by git-rebase as I’ve never encountered as situation where rebasing has ever lost any useful history, but it still looks worth checking out. Here’s a video from the git merge conference:
{{flash href=”https://www.youtube.com/v/FMZ2_-Ny_zc”}}