more robust git pull

2020-02-26 16:59:22 +00:00
parent cddac81977
commit 4199ec7c35
1 changed files with 2 additions and 1 deletions
--- 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