diff --git a/.config/dotfiles/setup-machine.sh b/.config/dotfiles/setup-machine.sh
index c52054b..1fd6ecb 100755
--- a/.config/dotfiles/setup-machine.sh
+++ b/.config/dotfiles/setup-machine.sh
@@ -102,10 +102,10 @@ then
     git clone --separate-git-dir=$GIT_DIR $GIT_REMOTE $HOME/tmp-dotfiles
     rm -r ~/tmp-dotfiles
 else
-    /usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" pull
+    /usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" pull || true
 fi
-/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" config --local status.showUntrackedFiles no
-/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" checkout
+/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" config --local status.showUntrackedFiles no || true
+/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" checkout || true
 
 # reload bash_profile to configure the current shell with the just installed dotfiles
 . ~/.bash_profile