If you get a version, you’re good. If not, do the following:

Install homebrew:

/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

brew install git

Go to: https://github.com/damonJansenDexcom/git101.git

In the upper right, click "Fork"

Either:

a. Go to "Code" and copy the link for how you clone repos.

git clone <link you copied>

b. If you do not have authentication set up, you can just "Download ZIP". Unzip the file.

cd git101

(You'll be able to work locally, but you can ignore anything referring to push, remote, upstream)

To use VS Code:

export GIT_EDITOR="code --wait"

(Note that this only affects the shell you run it in. You'll need to add it to your .bashrc / .zshrc / similar to )

You can see the remote and local branches

branch 'test-branch-3' set up to track 'origin/test-branch-3'.

Switched to a new branch 'test-branch-3'

"set up to track" -> we have a link between our local branch and the remote branch, and they both have the same name

git push

Copy the instructions given to create a remote (upstream) branch

git push --set-upstream origin <your-name>-from-test-branch-3

fatal: The current branch damon-jansen-from-test-branch-3 has no upstream branch.

2. git status

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git restore <file>..." to discard changes in working directory)

modified: testfile-3.txt

no changes added to commit (use "git add" and/or "git commit -a")

git status

"Change potatoes -> turnips" is a message/label that tells everyone that the commit was about.

git status

git stash save "<description of changes>"

git status

git stash list

git stash apply

Make some changes

git stash save "<description of changes>"

git stash list

git stash apply stash@{0}

git stash apply puts back the changes for the most recent stash (stash@{0})

git stash apply stash@{<number>} lets you apply a particular stash

Change the text of your commit message

git push

…

git push --force

git push --force

to rewrite over the remote, choosing the version that is local

Change pick to reword (or just r)

Change the commit message and save

HEAD~1 is one commit before that

Note the first two commits

git rebase -i HEAD~2

Keep pick on the first commit

Change pick to squash (or just s) on the second commit

…

git log

Note in the git log that there is only one commit where there used to be two.

git status

Often, a next step:

git checkout -b <your-name>-branching-from-a-git-hash

Often, a next step is to checkout a new branch.

git push origin <a-great-name-for-a-tag>

git log

git checkout dj-here-is-a-great-tag

git log

Note that the most recent commit (the one at the top) has the "dj-here-is-a-great-tag" tag

git checkout -b <your-name>-branch-to-rebase

Now, make any old commit.

git log

Notice that (reading top to bottom), it now has your commit, then the tagged one.

Now, we want to get some recent changes from `main` branch.

git fetch origin

git rebase origin/main

git log

Notice that your commit is still at the top, but there are commits in between it and the tagged commit. The history has changed.

This kind of rebase can be hard if there are a lot of conflicts between what you've done and what's on the other branch.

See the next example for a solution

git checkout dj-here-is-a-great-tag

git checkout -b <your-name>-branch-to-merge

Now, make any old commit.

git fetch origin

git merge origin/main

Complete the commit message like an commit.

git log

Note that the history has not changed. There is just a new "merge commit" that represents the bringing of that new material in.

cd <name-of-sandbox>

git init