From 4199ec7c35b3c0c7969b1d955a2ed745feb0961b Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Wed, 26 Feb 2020 16:59:22 +0000
Subject: [PATCH] more robust git pull

---
 bootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2785e47..625ab5f 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -64,7 +64,8 @@ if [[ ! -d $dotfiles_dir ]]; then
     mkdir -p "$dotfiles_dir"
     git clone -q "$repository_url" "$dotfiles_dir"
 else
-    git --git-dir="$dotfiles_dir/.git" pull -q origin master || true
+    git --git-dir="$dotfiles_dir/.git" fetch -q
+    git --git-dir="$dotfiles_dir/.git" rebase -q --autostash FETCH_HEAD
 fi
 
 # Install dotfiles