Commit ac33e9f4 authored by Daniel Wortmann's avatar Daniel Wortmann

Changed git-hook to fix issue #164

parent 0aad10ba
#!/bin/sh
if git rev-parse -q --verify MERGE_HEAD
then
echo "In merge state"
else
git stash -q --keep-index
if git diff HEAD|grep -i " STOP"|grep -q '\+'
then
......@@ -16,3 +20,4 @@ EOF
exit 1
fi
git stash pop -q
fi
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment