From: ng0 <ng0@n0.is>
Date: Tue, 5 Mar 2019 10:35:01 +0000 (+0000)
Subject: handbook_pull.sh
X-Git-Tag: v0.11.1~171
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e4039ea6d8341b5c7e4e7a34b44d024d8a21d51;p=oweals%2Fgnunet.git

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