Inspect (in parallel): git status, git diff + git diff --staged, git log --oneline -10 (match the repo's message style).
Ensure .gitattributes: if there's no .gitattributes at the repo root, create one containing * text=auto eol=lf and stage it with this commit. This normalises line endings and prevents CRLF/LF churn across platforms (Windows especially). If one already exists, leave it as-is.
Stage deliberately — don't blindly git add -A. Review untracked files; exclude artifacts and anything that may hold secrets (.env, keys, creds). Track which obviously-shouldn't-be-committed files you skipped (build output, node_modules/, logs, caches) — they signal a .gitignore gap.
Commit (see OS-safe commit below).
Pull (git pull --rebase): run immediately after commit to integrate remote changes. Handle outcomes:
- Clean / fast-forward: report "pull clean, tree up to date".
- Rebase conflicts: run git rebase --abort, report which files conflicted, and tell the user to resolve manually before pushing. Do NOT attempt auto-resolution.
- Diverged / merge conflicts: report the conflicting files and stop. Suggest git pull --rebase after manual resolution.
- Already up to date: nothing to do, proceed.
Verify: git status after pull; report tree state + commits ahead/behind remote.
Suggest .gitignore update: if step 3 found files that obviously shouldn't be tracked, list them and offer to add the matching .gitignore entries. Only edit .gitignore if the user agrees.
Ask to push: end your reply by asking whether the user wants to push. Only git push if they say yes.

Safe commit (CRITICAL)

Single-line message works anywhere: git commit -m "subject".

Multi-line message: inline heredocs/here-strings are shell-specific and fragile across platforms, so git commit -m "$(cat <<'EOF' ...)" is not portable. Instead, write the message to a temp file with the Write tool, then commit with -F:

git add <paths> && git commit -F .git/COMMIT_EDITMSG_TMP && git status

Delete the temp file afterward (Delete tool / rm).

Git safety

Never update git config; never force-push/hard-reset unless explicitly asked.
--amend only if asked AND the commit is unpushed + authored this session.
Commit only when asked; push only when explicitly requested.

git-commit

Commit to Git

Workflow