e4f801a594
The pre-commit is a bit stripped down compared to the LibreOffice master. Change-Id: I162ec1007fa1db5bd8fca522d712db50dafaf998
12 lines
375 B
Bash
Executable file
12 lines
375 B
Bash
Executable file
#!/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
|