Created
June 14, 2013 09:58
-
-
Save canton7/5780755 to your computer and use it in GitHub Desktop.
Finding files deleted by evil merges
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The following snippet might help detect evil merges which deleted a file. | |
$ for rev in `git rev-list --merges HEAD`; do del=`( git diff --name-only --diff-filter=D $rev^ $rev; git diff --name-only --diff-filter=D $rev^2 $rev ) | sort | uniq -u | tr '\n' ' '`; [ -n "$del" ] && echo "$rev $del"; done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment