From 4e4039ea6d8341b5c7e4e7a34b44d024d8a21d51 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 5 Mar 2019 10:35:01 +0000 Subject: [PATCH] handbook_pull.sh --- contrib/gnunet_infrastructure/handbook_pull.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 contrib/gnunet_infrastructure/handbook_pull.sh diff --git a/contrib/gnunet_infrastructure/handbook_pull.sh b/contrib/gnunet_infrastructure/handbook_pull.sh new file mode 100755 index 000000000..16c7430ae --- /dev/null +++ b/contrib/gnunet_infrastructure/handbook_pull.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# +# This essentially could be solved by: +# git config pull.rebase true +# git config rebase.autoStash true +# but chances are that this is easy to +# forget. +# so execute this file on the server +# instead of setting a git config. + +echo "Running git pull with autoStash and rebase" +echo "If anything breaks in the future, delete" +echo "and repeat - it was once considered to" +echo "be responsible for non-trivial conflicts!" +echo "We apply this because we need to build the" +echo "handbook and tutorial without manual interventions." + +git pull --rebase --autostash -- 2.25.1