Git cheatsheet

Flow

1
2

[Working directory] -> [Staging Area (Index)] -> [Repository] -> [Remote]
                   add                      commit           push

Basic

• git init : init directory as a git repo
• git clone [url] : clone repo
• git branch : list branches
• git checkout [branch] : switch branch
• git checkout -b [branch] : create new branch
• git checkout -d [branch] : delete branch
• git checkout [commit] : switch branch to specific commit
• git fetch : fetch changes
• git pull : fetch + merge changes
• git push : push changes
  • git push origin [branch] : push branch
  • git push --force origin [branch] : push branch after rebase
• git add [file] : add changes
  • git add . : add all changes
  • git add -p : add changes interactively
• git commit -m "[message]" : commit changes
• git status : status of local repo

Diff

• git diff [file a] [file b] : diff two files
  • --cached : diff the added files
  • -w : ignore whitespaces
  • -b : ignore whitespaces at eol
  • --ignore-cr-at-eol : ignore endlines
  • --name-only : only list files
• git -c core.fileMode=false diff : diff two files, ignore file permissions
• difftastic

Merge

• git rebase [src branch] : rebase current branch from another branch
• git merge [branch] : merge branch into current branch
• git cherry-pick [commit] : pull specific commit

Revert

• git reset --soft [commit] : unstage commit
• git reset --hard [commit] : undo commit
• git checkout [file] : revert local change to a file
• git reset --hard HEAD : revert all local changes
• git reset --soft HEAD~1 : undo local commit, not pushed yet
• git revert [commit] : create revert commit
• git ... : undo remote commit
  • git reset --hard [commit]
  • git push origin [branch] -f
• git clean -xdf
  • -n : dry run
  • -x : ignore .gitignore
  • -d : recursive
  • -f : force
  • -X : only ignored files

Revert rebase not pushed

1. find the commit just before the rebase : gif reflog
2. revert : git reset --hard [commit]

1
2

    <hash> HEAD@{1}: rebase: ...
    <hash> HEAD@{2}: checkout: moving from ...

Stash & Patch

• git stash
  • save "[message]" : stash current changes
  • list : show stash
  • pop : pop stash
  • drop : drop stash
  • apply stash@{0} : apply stash
  • show -p stash@{0} : show stash changes
• git show -p stash@{0} > [patch file].patch : create patch from stash
• git diff > [patch file].patch : create patch from unstaged changes
• git diff --cached > [patch file].patch : create patch from staged changes
• git apply [patch file].patch : apply patch file

Tags

• git tag : list tags
• git tag [tag name] : add tag
• git push --tags : push tags

Info

• git log : show changes log
  • --stats :
• git reflog : show local repo history
• git show [commit] : get info on commit
• git blame -L [start line],[end line] [file] : find who last edited a file at specific line
• git remote -v : list remote
• git remote show origin : info on remote
• git remote add [remote name] [remote url] : add remote
• git remote set-url origin [remote url] : change remote

Bisect

1. checkout repo at bad commit
   • git checkout [commit]
2. start bisect
   • git bisect start
   • git bisect bad
3. mark known good commit
   • git bisect good [commit]
4. checkout commit in between bad and good (done by bisect automatically)
5. check if commit is still bad
   • git bisect bad/good
6. repeat 4-5 until found the guilty commit
7. stop bisect (checkout to previous state)
   • git bisect reset

Submodules

• git clone --recursive : clone with submodules
• git submodule update --init --recursive : pull submodules after clone
• git submodule add [submodule url] : add submodule

Remove submodule

1. git rm [submodule]
2. rm -rf .git/modules/[submodule]
3. git config --remove-section submodule.[submodule]
4. git commit

Binary files - LFS (Large File Storage)

1. git lfs install : install LFS, once per user
2. git lfs track "*.[file type]" : add file type to track with LFS
3. git add .gitattributes : make sure that this is tracked

Config

• cat ~/.gitconfig : show git config

1
2
3
4
5
6
7
8
9

[user]
    name = [FIRST NAME] [LAST NAME]
    email = [EMAIL]
[credential]
    helper = store
[log]
    date = local
[format]
    pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%aN%Cred%d %Creset%s

• git config --global pull.rebase true : always rebase on pull
• git config --global core.autocrlf true : convert CRLF <-> LF (Windows)

GitHub password

GitHub is no longer accepting account passwords, need to use PAT (Personal Access Token).

• Create a PAT using https://github.com/settings/tokens
• git config --global credential.helper store
  • Stores the PAT in ~/.git-credentials (plain text).
• git pull
  • Enter the PAT as password, won't be asked ever again.