diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-01 23:48:10 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-16 11:28:26 -0500 |
| commit | 9152c42a65c199893d2d2809153a709bd2f619f8 (patch) | |
| tree | dd15a0949c52ded5c71262188f83f70eed45814e /.git-hooks/post-merge | |
| parent | 074bb522927c60f2575fdc5bcb83eb17a4dfc4b7 (diff) | |
submodules migration
Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
Diffstat (limited to '.git-hooks/post-merge')
| -rwxr-xr-x | .git-hooks/post-merge | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.git-hooks/post-merge b/.git-hooks/post-merge new file mode 100755 index 000000000000..25e62ed8a97f --- /dev/null +++ b/.git-hooks/post-merge @@ -0,0 +1,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 |