Comment by xavhan

love this one :

    git diff --name-only | uniq | xargs $EDITOR

(opens all modified files)

and this one to open files with conflicts

    git diff --name-only --diff-filter=U | uniq  | xargs $EDITOR