sync: auto-sync from Mikes-MacBook-Air.local at 2026-04-21 19:25:08

Author: Mike Swanson
Machine: Mikes-MacBook-Air.local
Timestamp: 2026-04-21 19:25:08
This commit is contained in:
2026-04-21 19:25:08 -07:00
parent 2011064af3
commit 00dc60f460

View File

@@ -65,12 +65,6 @@ echo -e "${GREEN}[OK]${NC} Syncing as: $USER_DISPLAY (machine: $MACHINE)"
echo "" echo ""
echo "=== Phase 1: Local changes ===" echo "=== Phase 1: Local changes ==="
# Update submodules to latest remote before staging so we never commit a stale pointer
if [ -f ".gitmodules" ]; then
echo -e "${GREEN}[OK]${NC} Updating submodules to latest remote..."
git submodule update --remote --quiet 2>/dev/null || true
fi
if ! git diff-index --quiet HEAD -- 2>/dev/null; then if ! git diff-index --quiet HEAD -- 2>/dev/null; then
echo -e "${YELLOW}[INFO]${NC} Local changes detected:" echo -e "${YELLOW}[INFO]${NC} Local changes detected:"
git status --short git status --short