dotfiles/bin/git-blameconflict
2018-02-22 09:56:10 -05:00

3 lines
152 B
Bash
Executable file

#!/bin/bash
for f in $(git status --porcelain|grep '^UU'|awk '{print $2}'); do echo "$f"; git --no-pager blame -L '/^<<<</,/^>>>>/' -- $f; echo; done;