diff --git a/cheat-sheet.md b/cheat-sheet.md index 174e266..6f495d5 100644 --- a/cheat-sheet.md +++ b/cheat-sheet.md @@ -6,94 +6,94 @@ ## Essential Git Commands -### `git clone` +### `gitt clone` Download a remote repository to your local machine. ```bash -git clone https://github.com//.git +gitt clone https://gitthub.com//.gitt ``` --- -### `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. --- @@ -101,12 +101,12 @@ git pull --rebase origin main | 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 | --- @@ -114,5 +114,5 @@ git pull --rebase origin main 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 ` -4. Continue the rebase: `git rebase --continue` +3. Stage the resolved file: `gitt add ` +4. Continue the rebase: `gitt rebase --continue` diff --git a/menu.md b/menu.md index 36e576c..9988561 100644 --- a/menu.md +++ b/menu.md @@ -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 | diff --git a/recipes/taco.md b/recipes/taco.md new file mode 100644 index 0000000..7b83238 --- /dev/null +++ b/recipes/taco.md @@ -0,0 +1,2 @@ +# Taco +**Prep:** 5m