summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-03-05 10:35:01 +0000
committerng0 <ng0@n0.is>2019-03-05 10:35:01 +0000
commit4e4039ea6d8341b5c7e4e7a34b44d024d8a21d51 (patch)
treebf1d5980ae2aac1b8260c8794fb4948760c60609 /contrib
parent7ff4f5d008a72da6ee122baebbec0582dc71eb0a (diff)
handbook_pull.sh
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/gnunet_infrastructure/handbook_pull.sh18
1 files changed, 18 insertions, 0 deletions
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