Version-control basics done correctly. git is in the runtime; this skill is the workflow that keeps your changes reviewable and avoids the common footguns (committing the wrong files, pushing to the wrong place, mangling history).

Standard workflow

Know where you are. Before touching anything:

git status            # what's changed / staged / untracked
git branch --show-current

Branch off the base. Never commit straight to main unless explicitly told to. Create a focused branch from an up-to-date base:
```
git switch -c feature/short-description
```

Review before you stage. Read your own diff — it's the cheapest bug catch there is:

git diff               # unstaged changes
git diff --staged      # what a commit would include

Stage deliberately. Prefer naming paths over git add -A, so you don't sweep in unrelated or generated files:
```
git add path/to/changed_file.py path/to/other.py
```
Commit with a meaningful message. One logical change per commit. First line ≤ ~72 chars, imperative mood, explaining the why:
```
git commit -m "Fix off-by-one in pagination cursor"
```
Push to your branch. Set the upstream on the first push:
```
git push -u origin feature/short-description
```

Inspecting

git log --oneline -20            # recent history, compact
git log --oneline --stat -5       # with files changed
git show <sha>                    # a single commit's diff
git diff main...HEAD              # everything your branch adds vs main

Cautions

Never rewrite shared history. No rebase or commit --amend on commits you've already pushed or that others may have. New commits only.
Never force-push a shared branch (especially main).
Check the remote and branch before pushing (git remote -v, git branch --show-current) — pushing to the wrong place is hard to undo cleanly.
Don't commit secrets or build artifacts. Verify with git status / git diff --staged that only intended files are staged; respect .gitignore.
Configure identity locally for the repo if it isn't already set (git config user.name / user.email), rather than relying on a global default that may be wrong for this project.

Más de este repositorio

mismo repositorio

csv-process

calliopeai/astrolift-skills

Read, filter, select, aggregate, and join CSV / tabular data without spinning up a full data stack.

2026-06-190

data-transform

calliopeai/astrolift-skills

jq-style select, filter, and reshape over JSON and YAML — extract paths, map arrays, and filter records without writing throwaway code.

2026-06-190

export

calliopeai/astrolift-skills

Write a dataset (array of records) to CSV, JSON, XLSX, or PDF through one interface — format chosen by the output extension.

2026-06-190

file-ops

calliopeai/astrolift-skills

Read, write, search, and edit files in the workspace safely — atomic writes, exact-match edits, and recursive content search.

2026-06-190

http-request

calliopeai/astrolift-skills

Make HTTP/REST requests with auth, custom headers, query/body, pagination, retries with backoff, and structured error handling.

2026-06-190

mcp-client

calliopeai/astrolift-skills

Connect to a Model Context Protocol (MCP) server, perform the handshake, discover its tools, and invoke them over JSON-RPC.

2026-06-190

git

Standard workflow

Know where you are. Before touching anything:

git status            # what's changed / staged / untracked
git branch --show-current

Branch off the base. Never commit straight to main unless explicitly told to. Create a focused branch from an up-to-date base:

git switch -c feature/short-description

Review before you stage. Read your own diff — it's the cheapest bug catch there is:

git diff               # unstaged changes
git diff --staged      # what a commit would include

Stage deliberately. Prefer naming paths over git add -A, so you don't sweep in unrelated or generated files:

git add path/to/changed_file.py path/to/other.py

Commit with a meaningful message. One logical change per commit. First line ≤ ~72 chars, imperative mood, explaining the why:

git commit -m "Fix off-by-one in pagination cursor"

Push to your branch. Set the upstream on the first push:

git push -u origin feature/short-description

Inspecting

git log --oneline -20 # recent history, compact git log --oneline --stat -5 # with files changed git show <sha> # a single commit's diff git diff main...HEAD # everything your branch adds vs main

Cautions

Never rewrite shared history. No rebase or commit --amend on commits you've already pushed or that others may have. New commits only.

Never force-push a shared branch (especially main).

Check the remote and branch before pushing (git remote -v, git branch --show-current) — pushing to the wrong place is hard to undo cleanly.

Don't commit secrets or build artifacts. Verify with git status / git diff --staged that only intended files are staged; respect .gitignore.

Configure identity locally for the repo if it isn't already set (git config user.name / user.email), rather than relying on a global default that may be wrong for this project.