Git and GitHub

The Git workflow in eight steps

Each step shows the commands you’ll run and links to the guides that explain them in detail.

1. 1

   Set up Git

   Install Git, tell it who you are, and connect it to GitHub.

   git --version
   git config --global user.name "Your Name"
   git config --global user.email "you@example.com"

   Install Git git config Add an SSH key Git Bash

2. 2

   Start a repository

   Create a new repository or copy an existing one.

   git init
   git clone https://github.com/user/repo.git

   git init git clone Clone from GitHub .gitignore

3. 3

   Record changes

   Check what changed, stage it and commit it.

   git status
   git add file.txt
   git commit -m "Describe the change"

   git status Staging git commit git diff

4. 4

   Work on a branch

   Keep new work separate until it is ready.

   git switch -c feature-x
   git switch main
   git branch -d feature-x

   Create a branch Switch branches Rename Delete

5. 5

   Sync with the remote

   Send your commits and bring in other people’s.

   git push -u origin feature-x
   git fetch
   git pull

   git push git fetch git pull origin

6. 6

   Combine work

   Bring a branch back in and settle any conflicts.

   git merge feature-x
   git rebase main

   git merge git rebase Resolve conflicts Open a pull request

7. 7

   Undo a mistake

   Pick the command by what you need to undo and whether it has been pushed.

   git restore --staged file.txt
   git revert <commit>
   git reset --soft HEAD~1
   git stash

   Unstage a file git revert git reset git stash

8. 8

   Investigate history

   Find out what changed, when, and who changed it.

   git log --oneline
   git blame file.txt
   git bisect start

   git log git blame git bisect Commit hashes

Commands use current Git syntax. git switch and git restore arrived in Git 2.23; on older versions, use git checkout. The Git cheat sheet has every command on one page.