[GNUnet-SVN] [gnunet] branch master updated: handbook_pull.sh

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 4e4039ea6 handbook_pull.sh
4e4039ea6 is described below

commit 4e4039ea6d8341b5c7e4e7a34b44d024d8a21d51
Author: ng0 <address@hidden>
AuthorDate: Tue Mar 5 10:35:01 2019 +0000

    handbook_pull.sh
---
 contrib/gnunet_infrastructure/handbook_pull.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

-- 
To stop receiving notification emails like this one, please contact
address@hidden