2
0

handbook_pull.sh 571 B

123456789101112131415161718
  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. echo "Running git pull with autoStash and rebase"
  11. echo "If anything breaks in the future, delete"
  12. echo "and repeat - it was once considered to"
  13. echo "be responsible for non-trivial conflicts!"
  14. echo "We apply this because we need to build the"
  15. echo "handbook and tutorial without manual interventions."
  16. git pull --rebase --autostash