diff options
Diffstat (limited to 'git-hooks/post-merge')
| -rwxr-xr-x | git-hooks/post-merge | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge deleted file mode 100755 index 25e62ed8a97f..000000000000 --- a/git-hooks/post-merge +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Do not warn if there were no real merge -git rev-parse -q --verify HEAD^2 >/dev/null || exit - -echo -echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" -echo "! You probably used 'git pull' instead of 'git pull -r' !" -echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" -echo -echo "You can still fix it - please do 'git pull -r' now." -echo |