diff options
Diffstat (limited to 'contrib/gnunet_infrastructure/handbook_pull.sh')
-rwxr-xr-x | contrib/gnunet_infrastructure/handbook_pull.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/contrib/gnunet_infrastructure/handbook_pull.sh b/contrib/gnunet_infrastructure/handbook_pull.sh deleted file mode 100755 index 16c7430ae..000000000 --- a/contrib/gnunet_infrastructure/handbook_pull.sh +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # This essentially could be solved by: | ||
4 | # git config pull.rebase true | ||
5 | # git config rebase.autoStash true | ||
6 | # but chances are that this is easy to | ||
7 | # forget. | ||
8 | # so execute this file on the server | ||
9 | # instead of setting a git config. | ||
10 | |||
11 | echo "Running git pull with autoStash and rebase" | ||
12 | echo "If anything breaks in the future, delete" | ||
13 | echo "and repeat - it was once considered to" | ||
14 | echo "be responsible for non-trivial conflicts!" | ||
15 | echo "We apply this because we need to build the" | ||
16 | echo "handbook and tutorial without manual interventions." | ||
17 | |||
18 | git pull --rebase --autostash | ||