From d43eeeb3cd71ac98818bbe15defb3a9983c1d321 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sat, 9 Jul 2022 18:28:02 +0300 Subject: [PATCH] Add ignoring of local changes --- tools/upgrade.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index cf5d007..5e085f8 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -9,6 +9,11 @@ CLEAR_COLOR="\033[0m" cd $HOME/.dotfiles echo "1) ${GREEN}Upgrading dotfiles$CLEAR_COLOR" + +# ignore local changes + +git reset --hard HEAD > /dev/null 2>&1 + if ! git pull > /dev/null 2>&1 then echo "$HOME/.dotfiles synced"