git-hooks/post-merge

   1 #!/bin/bash
   2
   3 # Do not warn if there were no real merge
   4 git rev-parse -q --verify HEAD^2 >/dev/null || exit
   5
   6 echo
   7 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   8 echo "! You probably used 'git pull' instead of 'git pull -r' !"
   9 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
  10 echo
  11 echo "You can still fix it - please do 'git pull -r' now."
  12 echo