/dev/null || git checkout -b atheos-writer) && git push -u origin atheos-writer", "icon": "fas fa-code-branch", "owner": "armistace" }, { "uuid": "macro-writer-0002-commit", "title": "2. Commit + Push Writer Branch", "type": "folder", "fTypes": [], "command": "cd %PATH% && (git config --get user.email >/dev/null || { echo 'ERROR: no git identity set. Run over SSH: git config --global user.name \"Your Name\" && git config --global user.email \"you@example.com\" (RUNBOOK STEP 1)'; exit 1; }) && git add -A && (git diff --cached --quiet || git commit -m \"writer: $(date +%F_%H%M)\") && git push origin atheos-writer", "icon": "fas fa-cloud-upload-alt", "owner": "armistace" }, { "uuid": "macro-writer-0003-reset", "title": "3. DESTRUCTIVE: Reset Writer Branch to Master", "type": "folder", "fTypes": [], "command": "cd %PATH% && git fetch origin && git reset --hard origin/master && git push --force-with-lease origin atheos-writer", "icon": "fas fa-exclamation-triangle", "owner": "armistace" }, { "uuid": "macro-writer-0004-status", "title": "4. Status + Recent Log", "type": "folder", "fTypes": [], "command": "cd %PATH% && git status --short --branch && echo '--- recent commits:' && git log --oneline -8 && echo '--- local branches:' && git branch", "icon": "fas fa-info-circle", "owner": "armistace" }, { "uuid": "macro-writer-0005-refresh", "title": "5. Refresh Master (ff-only)", "type": "folder", "fTypes": [], "command": "cd %PATH% && git checkout master && git pull --ff-only && git checkout atheos-writer", "icon": "fas fa-sync-alt", "owner": "armistace" }, { "uuid": "macro-writer-0006-pullmaster", "title": "6. Merge Master Into Writer Branch", "type": "folder", "fTypes": [], "command": "cd %PATH% && (git config --get user.email >/dev/null || { echo 'ERROR: no git identity set. Run over SSH: git config --global user.name \"Your Name\" && git config --global user.email \"you@example.com\" (RUNBOOK STEP 1)'; exit 1; }) && git fetch origin && git merge origin/master -m \"merge master into atheos-writer\" && git push origin atheos-writer", "icon": "fas fa-code-merge", "owner": "armistace" } ]|*/?>