1
0
Fork 0
mirror of https://github.com/correl/dotfiles.git synced 2024-12-20 03:20:17 +00:00
dotfiles/bin/git-blameconflict

4 lines
152 B
Text
Raw Normal View History

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