summaryrefslogtreecommitdiff
path: root/contrib/gnunet_infrastructure/handbook_pull.sh
blob: 16c7430ae32df154ff728d70c2bac2ac099c6153 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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