summaryrefslogtreecommitdiffstats
path: root/.git-hooks/post-merge
diff options
context:
space:
mode:
Diffstat (limited to '.git-hooks/post-merge')
-rwxr-xr-x.git-hooks/post-merge12
1 files changed, 12 insertions, 0 deletions
diff --git a/.git-hooks/post-merge b/.git-hooks/post-merge
new file mode 100755
index 000000000..b1be51202
--- /dev/null
+++ b/.git-hooks/post-merge
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# 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