\r \r

Git CLI Helper\r

\r This skill explains how to use the Git command line for everyday development tasks in a repository.\r \r

When to Use\r

\r Use this skill when:\r \r

• The user wants to know “what changed” in the working tree.\r
• The user wants to stage, unstage, or commit files.\r
• The user wants to create or switch branches.\r
• The user wants to pull from or push to a remote.\r
• The user needs help with stashing, viewing history, or inspecting diffs.\r \r

Requirements\r

\r

• Git is installed and available on the PATH (for example git --version succeeds).\r
• The current directory is either:\r
  • Inside a Git repository, or\r
  • A location where the user intends to run git init or git clone.\r \r When uncertain, suggest the user run:\r \r

git status\r
```\r
\r
to see whether the current folder is a Git repository.\r
\r
## Safety Guidelines\r
\r
- Prefer **read-only commands** first (`git status`, `git diff`, `git log`) before suggesting changing commands.\r
- Avoid destructive suggestions such as:\r
  - `git reset --hard`\r
  - `git clean -fdx`\r
  - `git push --force`\r
- Only mention or recommend such commands if the user explicitly asks and understands the risk.\r
\r
## Common Workflows\r
\r
### 1. Inspect current state\r
\r
Check what has changed and whether there are untracked files:\r
\r
```bash\r
git status\r
```\r
\r
See detailed changes in the working tree:\r
\r
```bash\r
git diff           # unstaged changes\r
git diff --staged  # staged (to-be-committed) changes\r
```\r
\r
### 2. Stage and unstage changes\r
\r
Stage a specific file:\r
\r
```bash\r
git add path/to/file\r
```\r
\r
Stage all tracked and untracked changes:\r
\r
```bash\r
git add .\r
```\r
\r
Unstage a file (keep changes in the working tree):\r
\r
```bash\r
git restore --staged path/to/file\r
```\r
\r
### 3. Create commits\r
\r
Create a commit with a message:\r
\r
```bash\r
git commit -m "short, descriptive message"\r
```\r
\r
If the user prefers a multi-line message, suggest:\r
\r
```bash\r
git commit\r
```\r
\r
which opens their editor.\r
\r
### 4. Branching and switching\r
\r
Create and switch to a new branch:\r
\r
```bash\r
git checkout -b feature/my-branch\r
```\r
\r
Switch to an existing branch:\r
\r
```bash\r
git checkout main\r
```\r
\r
List local branches:\r
\r
```bash\r
git branch\r
```\r
\r
### 5. Synchronize with remote\r
\r
If the repository already has a remote (for example `origin`):\r
\r
- Fetch latest remote data:\r
\r
```bash\r
git fetch\r
```\r
\r
- Pull latest changes into current branch:\r
\r
```bash\r
git pull\r
```\r
\r
- Push the current branch and set upstream:\r
\r
```bash\r
git push -u origin \x3Cbranch-name>\r
```\r
\r
For subsequent pushes on the same branch:\r
\r
```bash\r
git push\r
```\r
\r
### 6. Cloning and initializing\r
\r
Clone an existing remote repository:\r
\r
```bash\r
git clone \x3Crepo-url>\r
```\r
\r
Initialize a new repository in the current folder:\r
\r
```bash\r
git init\r
```\r
\r
Optionally add a remote:\r
\r
```bash\r
git remote add origin \x3Crepo-url>\r
```\r
\r
### 7. Stashing work-in-progress\r
\r
When the user needs to temporarily put aside local changes:\r
\r
```bash\r
git stash\r
```\r
\r
List stashes:\r
\r
```bash\r
git stash list\r
```\r
\r
Apply and keep the top stash:\r
\r
```bash\r
git stash apply\r
```\r
\r
Apply and drop the top stash:\r
\r
```bash\r
git stash pop\r
```\r
\r
## Viewing History and Blame\r
\r
Show recent commits (compact format):\r
\r
```bash\r
git log --oneline --decorate --graph --all\r
```\r
\r
See who last changed each line of a file:\r
\r
```bash\r
git blame path/to/file\r
```\r
\r
## Troubleshooting Tips\r
\r
- If Git reports “not a git repository”, suggest:\r
  - Running commands in the correct project folder, or\r
  - Initializing with `git init` (if appropriate), or\r
  - Cloning with `git clone \x3Crepo-url>`.\r
- If a push is rejected because the remote has new commits, suggest:\r
  - `git pull --rebase` or `git pull` (depending on the team’s policy), then retry `git push`.\r
- If there are merge conflicts, explain:\r
  - The user must edit the conflicted files,\r
  - Mark conflicts as resolved by `git add`,\r
  - Then complete the merge or rebase with `git commit` or `git rebase --continue`.\r
\r