Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,113 +6,113 @@

## Essential Git Commands

### `git clone`
### `gitt clone`
Download a remote repository to your local machine.
```bash
git clone https://github.com/<username>/<repo>.git
gitt clone https://gitthub.com/<username>/<repo>.gitt
```
Comment on lines +9 to 13
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Git commands/URLs in this section are misspelled (gitt, gitthub.com, .gitt), which makes the cheat sheet instructions incorrect and will cause copy/pasted commands to fail. Please revert these to the correct git commands and github.com/.../.git URL format (and apply the same correction consistently throughout the file).

Copilot uses AI. Check for mistakes.
Comment on lines +9 to 13
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR description says this change is β€œAdded taco”, but this file also changes many Git command examples. If the intent of the PR is only to add the taco recipe, these cheat-sheet changes should be removed/split into a separate PR, or the PR description/checklist updated to reflect the additional scope.

Copilot uses AI. Check for mistakes.

---

### `git branch`
### `gitt branch`
List, create, or delete branches.
```bash
# List all local branches
git branch
gitt branch

# Create a new branch
git branch recipe/my-new-dish
gitt branch recipe/my-new-dish

# Delete a branch (after it's merged)
git branch -d recipe/my-new-dish
gitt branch -d recipe/my-new-dish
```

---

### `git checkout`
### `gitt checkout`
Switch to a different branch (or restore files).
```bash
# Switch to an existing branch
git checkout main
gitt checkout main

# Create a new branch AND switch to it in one step
git checkout -b recipe/my-new-dish
gitt checkout -b recipe/my-new-dish
```

---

### `git add`
### `gitt add`
Stage changes so they are included in your next commit.
```bash
# Stage a specific file
git add recipes/my-new-dish.md
gitt add recipes/my-new-dish.md

# Stage all changed files in the current directory
git add .
gitt add .
```

---

### `git commit`
### `gitt commit`
Save your staged changes to the local repository history.
```bash
git commit -m "feat: add my new dish recipe"
gitt commit -m "feat: add my new dish recipe"
```
> **Tip:** Write commit messages in the imperative mood: *"add recipe"* not *"added recipe"*.

---

### `git push`
### `gitt push`
Upload your local branch to the remote repository.
```bash
# Push a branch for the first time
git push origin recipe/my-new-dish
gitt push origin recipe/my-new-dish

# Push after a rebase (rewrites history β€” use with care)
git push origin recipe/my-new-dish --force-with-lease
gitt push origin recipe/my-new-dish --force-with-lease
```

---

### `git fetch`
### `gitt fetch`
Download the latest changes from the remote without applying them to your working branch.
```bash
# Fetch from the default remote (origin)
git fetch origin
gitt fetch origin
```
> **Tip:** Always `fetch` before you start working to see if anything has changed.

---

### `git pull`
### `gitt pull`
Fetch **and integrate** (merge by default) the latest changes into your current branch in one step.
```bash
# Pull from origin
git pull origin main
gitt pull origin main

# Pull and rebase instead of merge (cleaner history)
git pull --rebase origin main
gitt pull --rebase origin main
```
> **Tip:** Prefer `git fetch` + `git rebase` over `git pull` to keep commit history tidy.
> **Tip:** Prefer `gitt fetch` + `gitt rebase` over `gitt pull` to keep commit history tidy.

---

## Handy Extras

| Command | What it does |
|---------|-------------|
| `git status` | Show the state of your working directory and staging area |
| `git log --oneline` | Show a compact commit history |
| `git diff` | Show unstaged changes |
| `git stash` | Temporarily shelve uncommitted changes |
| `git rebase main` | Replay your commits on top of the latest `main` |
| `git remote -v` | List configured remote repositories |
| `gitt status` | Show the state of your working directory and staging area |
| `gitt log --oneline` | Show a compact commit history |
| `gitt diff` | Show unstaged changes |
| `gitt stash` | Temporarily shelve uncommitted changes |
| `gitt rebase main` | Replay your commits on top of the latest `main` |
| `gitt remote -v` | List configured remote repositories |
Comment on lines 102 to +109
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These table entries use gitt ... commands, which are not valid Git commands. Please correct them back to git ... to keep the cheat sheet accurate.

Copilot uses AI. Check for mistakes.

---

## Merge Conflict Quick Fix

1. Open the conflicted file and look for `<<<<<<<`, `=======`, `>>>>>>>` markers.
2. Edit the file to keep the correct content (remove the markers).
3. Stage the resolved file: `git add <filename>`
4. Continue the rebase: `git rebase --continue`
3. Stage the resolved file: `gitt add <filename>`
4. Continue the rebase: `gitt rebase --continue`
Comment on lines +117 to +118
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflict resolution steps reference gitt ..., which is not a valid command. Please correct these examples back to git add ... and git rebase --continue.

Suggested change
3. Stage the resolved file: `gitt add <filename>`
4. Continue the rebase: `gitt rebase --continue`
3. Stage the resolved file: `git add <filename>`
4. Continue the rebase: `git rebase --continue`

Copilot uses AI. Check for mistakes.
2 changes: 1 addition & 1 deletion menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
| 1 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 2 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 3 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 4 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 4 | Taco | @BadCook | Added |
| 5 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 6 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
| 7 | *(empty slot β€” waiting for a cook!)* | β€” | Open |
Expand Down
2 changes: 2 additions & 0 deletions recipes/taco.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Taco
**Prep:** 5m
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This recipe file doesn’t follow the repository’s required recipe template (Prep Time, Cook Time, Serves, Ingredients, Instructions) and the time value uses shorthand (5m) instead of including units (e.g. 5 minutes). Please expand this file to match the template in README.md so it’s consistent with other recipes and meets the project guidelines.

Suggested change
**Prep:** 5m
**Prep Time:** 5 minutes
**Cook Time:** 10 minutes
**Serves:** 2
## Ingredients
- 4 taco shells
- 1 cup cooked taco filling
- 1/2 cup shredded lettuce
- 1/2 cup diced tomatoes
- 1/2 cup shredded cheese
- Salsa, to serve
## Instructions
1. Warm the taco shells according to package instructions.
2. Heat the taco filling until warmed through.
3. Fill each taco shell with the taco filling.
4. Top with lettuce, tomatoes, cheese, and salsa.
5. Serve immediately.

Copilot uses AI. Check for mistakes.