From 940b4d1848e8c70ab7642901a68594e8016caffc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 18:51:28 +0200 Subject: Adding upstream version 1:7.0.4. Signed-off-by: Daniel Baumann --- translations/git-hooks/post-merge | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 translations/git-hooks/post-merge (limited to 'translations/git-hooks/post-merge') diff --git a/translations/git-hooks/post-merge b/translations/git-hooks/post-merge new file mode 100755 index 000000000..25e62ed8a --- /dev/null +++ b/translations/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 -- cgit v1.2.3