From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- helpcontent2/.git-hooks/post-merge | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 helpcontent2/.git-hooks/post-merge (limited to 'helpcontent2/.git-hooks/post-merge') diff --git a/helpcontent2/.git-hooks/post-merge b/helpcontent2/.git-hooks/post-merge new file mode 100755 index 0000000000..b1be51202a --- /dev/null +++ b/helpcontent2/.git-hooks/post-merge @@ -0,0 +1,12 @@ +#!/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 -- cgit v1.2.3