Git guide

• Quick start
• Set up Git
  • Install and configure Git, join GitHub
  • Get a graphical client
• Zulip-specific tools
  • Set up Git repo script
  • Configure continuous integration for your Zulip fork
  • Reset to pull request
  • Fetch a pull request and rebase
  • Fetch a pull request without rebasing
  • Push to a pull request
  • Delete unimportant branches
  • Merge conflict on yarn.lock file
• How Git is different
• Important Git terms
  • branch
  • cache
  • checkout
  • commit
  • fast-forward
  • fetch
  • hash
  • head
  • HEAD
  • index
  • pull
  • push
  • rebase
• Get Zulip code
  • Step 1a: Create your fork
  • Step 1b: Clone to your machine
  • Step 1c: Connect your fork to Zulip upstream
  • Step 2: Set up the Zulip development environment
  • Step 3: Configure continuous integration for your fork
• Working copies
  • Workflows
  • Relevant Git commands
• Using Git as you work
  • Know what branch you’re working on
  • Keep your fork up to date
  • Work on a feature branch
  • Run linters and tests locally
  • Stage changes
    • Get status of working directory
    • Stage additions with git add
    • Stage deletions with git rm
  • Commit changes
  • Push your commits to GitHub
  • Examine and tidy your commit history
  • Force-push changes to GitHub after you’ve altered your history
• Pull requests
  • Draft pull requests
  • Create a pull request
    • Step 0: Make sure you’re on a feature branch (not main)
    • Step 1: Update your branch with git rebase
    • Step 2: Push your updated branch to your remote fork
    • Step 3: Open the pull request
  • Update a pull request
• Collaborate
  • Fetch another contributor’s branch
  • Check out a pull request locally
• Fixing commits
  • Fixing the last commit
    • Changing the last commit message
    • Changing the last commit
  • Fixing older commits
    • Changing commit messages
    • Deleting old commits
  • Squashing commits
  • Reordering commits
  • Pushing commits after tidying them
• Reviewing changes
  • Changes on (local) working tree
  • Changes within branches
  • Changes between branches
• Get and stay out of trouble
  • Undo a merge commit
  • Restore a lost commit
  • Recover from a git rebase failure
  • Working from multiple computers
• Git cheat sheet
  • Common commands
  • Detailed cheat sheet