blob: 25e62ed8a97fbe9b7802fd42ed44f38e5e58ed26 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
|
#!/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
|
