diff --git a/install.sh b/install.sh index f274ebc..424851c 100755 --- a/install.sh +++ b/install.sh @@ -29,5 +29,7 @@ done # Install git hooks: point to repo's .githooks so post-merge auto-restarts services git config core.hooksPath "$REPO/.githooks" +# Add pull-clean alias: stash local changes, pull fresh, discard stashed +git config alias.pull-clean '!git stash && git pull' echo "[OK] Services installed and enabled" diff --git a/justfile b/justfile index 195b6c0..0265aa3 100644 --- a/justfile +++ b/justfile @@ -101,7 +101,7 @@ install: deploy: @git push origin HEAD 2>&1 @ssh {{SSH_OPTS}} "{{BOARD_USER}}@{{BOARD_HOST}}" "\ - cd {{REPO_DIR}} && git pull && \ + cd {{REPO_DIR}} && git stash && git pull && \ git config core.hooksPath .githooks && \ chmod +x scripts/*.py scripts/*.sh 2>/dev/null; \ echo '{{BOARD_PASS}}' | sudo -S systemctl daemon-reload && \