Git Notes

Working with git locally

• git init: initialize current folder as a git repository

• git clone <URL>: brings the git repo from to current folder

• git status: tells us what we need to know about our repository

• git add <FILE>: adds to the staging area

• git commit: open a text editor to write commit message

  • git commit -m "MESSAGE": writes MESSAGE as a commit without a text editor

• git log: shows the log (history) of our commits

  • git log --oneline: shows the shorter oneline commit

• git diff: compare current uncommited state with last known git state

  • git diff --staged: runs git diff between the staging area and last known state

• git diff HEAD~<NUMBER>: compares HEAD with commit ago (relative)

• git diff <HASH>: compares HEAD with the commit in

• git restore --source <HASH OR HEAD~> <FILE>: restore file to <HASH OR HEAD~>

  • git checkout <HASH OR HEAD~> <FILE>: restores file to <HASH OR HEAD~>
    • `git checkout <HASH OR HEAD~>: if you forget the file, you end up in detached head state
    • git checkout main: go back to main
    • git switch main: go back to main

Working with remotes

• git remote add <NAME> <URL>: adds the as a remote with the name
  • is by convention called `origin`
• git remote rm <NAME>: removes the remote called
• git remote -v: look at all the remotes you have
• git push <WHERE> <WHAT>: pushes the branch to
  • git push origin main
• git pull <WHERE> <WHAT>: pulls the branch in to local computer

Branches

• git branch <NAME>: create branch where you are (HEAD)

• git switch <NAME>: move to the branch

  • git checkout <NAME>: also move to the branch

• git swich -c <NAME>: create and move to the branch in 1 command

  • git checkout -b <NAME>: also create and move to branch in 1 command

• git merge <BRANCH>: merge into your current branch

• git rebase: command to change the history of a commit

  • Commits from git merge can be automatically combined

• git rebase <BRANCH>: incorporate changes from into current branch

  • git status: is your friend
  • git add <FILE>: to mark conflict resolution
  • git rebase --continue: move to next commit in rebase
  • git rebase --abort: undo git rebase step

• git rebase -i <COMMIT> HEAD~ or of commit to go into interactive rebase

  • you can make multiple commit changes here, e.g., squash/s
  • git rebase -i <HASH>^: use ^ to include that commit in interactive rebase

• git stash or git commit: to save work before moving branches

  • stash is temporary
  • git stash list: see your stashed commits
  • git stash apply: apply your last stashed commit
  • git stash clear: clean up your stashes

• A merge on the remote is called a "pull request" or "merge request"

  • git push <WHERE> <WHAT>
  • To update a PR, we make the changes to the branch locally and re-push

• A merge conflict can happen after a PR is issued.

• git fetch: update your git log without making any changes to your files

  • git fetch --prune: update your log and also remove deleted remote branches

• git push -f <WHERE> <WHAT>: force push to the remote the branch

  • git push --force-with-lease <WHERE> <WHAT>: more mindful of collaborators

Collaborators

• Second person to push, needs to sync the history
• Add collaborators in repository settings
• collaborators will then git clone <URL> to get repo on their computer
• Each person's branch changes are independent from one another
• Feature branches won't show conflicts until one of them is merged first
• In the settings you can setup branch protection rules to prevent direct changes

Git Workflows

• Adding a collaborator
• Branching workflow
• Git Flow: a special type of branching workflow
• Forking: is commonly used in open source projects
  • Fork: copy the original remote repo into your account
  • origin: is your own remote copy
  • upstream: is the original copy
  • Follow branching workflow