vigil-diff

watch git-diff's output with vim while you change files.

requirements

just copy bin/vigil somewhere into your $PATH

open first terminal and

cd /your/git/repo
vigil-diff file-to-watch

open second terminal and edit /your/git/repo/file-to-watch (using any $EDITOR)