From 4ab910d19edb7205143bd7cf8d52d4795f9f8c64 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Wed, 30 Nov 2022 09:35:14 +0000 Subject: [PATCH] Update .local/share/chezmoi/home/dot_local/bin/executable_provision, .local/bin/provision --- .local/bin/provision | 2 ++ .local/share/chezmoi/home/dot_local/bin/executable_provision | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.local/bin/provision b/.local/bin/provision index 42dedf88..c5ad3c64 100644 --- a/.local/bin/provision +++ b/.local/bin/provision @@ -167,6 +167,8 @@ if [ -d /usr/local/src/hiawatha ] && [ ! -w /usr/local/src/hiawatha ]; then fi if [ -d /usr/local/src/hiawatha/.git ]; then git config pull.rebase false + git reset --hard HEAD + git clean -fxd git pull origin master else rm -rf /usr/local/src/hiawatha diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_provision b/.local/share/chezmoi/home/dot_local/bin/executable_provision index 42dedf88..c5ad3c64 100644 --- a/.local/share/chezmoi/home/dot_local/bin/executable_provision +++ b/.local/share/chezmoi/home/dot_local/bin/executable_provision @@ -167,6 +167,8 @@ if [ -d /usr/local/src/hiawatha ] && [ ! -w /usr/local/src/hiawatha ]; then fi if [ -d /usr/local/src/hiawatha/.git ]; then git config pull.rebase false + git reset --hard HEAD + git clean -fxd git pull origin master else rm -rf /usr/local/src/hiawatha