Skip to content

Instantly share code, notes, and snippets.

@bolshchikov

bolshchikov/Git Workshop.md

Created April 27, 2022 15:25
Show Gist options
  • Save bolshchikov/b2263d139dc161e5f2c97280952dd147 to your computer and use it in GitHub Desktop.
Save bolshchikov/b2263d139dc161e5f2c97280952dd147 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git Workshop.md

Git Workshop

Goal: obtain intimate low-level knowledge of git commands and understanding

Local

  1. Intro
    1. Skip
    2. Branching - together
    3. Merge - everyone (4 mins) - happens merge commit that points to 2 commits in history; it's bad - harder to navigate in history; harder to revert; use rebase
    4. Rebase - everyone (2 mins) - rebase is preferable: one line of history commits, easy to reason about the project development
  2. Ramping Up
    1. Detach HEAD - together
    2. Skip
    3. Skip
    4. Revering changes - everyone - NEVER EVER do a reset on a master - always revert
  3. Moving around
    1. Cherry picking - everyone - when use ? UCR
    2. Interactive rebase - everyone - the pinnacle of git; when do we use it? - always, especially in merging branches
  4. A mixed bag
    1. Grabbing one commit - everyone
    2. Skip
    3. Skip
    4. Tags - everyone
  5. Advanced topics
    1. Rebase 9000 times
    2. Skip
    3. Branch spaghetti

Remote

  1. Git remotes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment