Git cheat sheet

git config --global user.name "Your Name"
git config --global user.email "[email protected]"
git config --global init.defaultBranch main
git config --global pull.ff only          # safe pull default
git init                                  # new repository here
git clone URL                             # copy a repository
git status                                # what is changed, staged, untracked
git add FILE                              # stage a file
git add -p                                # stage pieces of files
git commit -m "Fix retry loop in backup.sh"
git commit --amend --no-edit              # add staged changes to the last commit (unpushed)

git log --oneline --graph --decorate -15
git log -p -- FILE                        # changes to one file
git log -S"text"                          # commits that added or removed text
git log A..B                              # commits in B not in A
git show HASH                             # one commit in full
git diff                                  # working tree vs staging
git diff --staged                         # staging vs last commit
git diff main...feature                   # what the branch adds
git blame -L 40,60 FILE                   # who last changed each line

git branch                                # list branches
git switch -c feature/retry               # create and switch
git switch main
git merge feature/retry                   # merge into current branch
git merge --no-ff feature/retry           # always create a merge commit
git merge --abort                         # give up a merge
git rebase origin/main                    # replay my commits on the latest main
git rebase -i HEAD~4                      # tidy the last four commits
git rebase --abort
git branch -d feature/retry               # delete a merged branch
git cherry-pick HASH                      # copy one commit here

git remote -v
git fetch origin                          # download, change nothing local
git pull --ff-only                        # fetch and fast-forward only
git pull --rebase                         # fetch and replay my commits
git push -u origin feature/retry          # first push, set upstream
git push --force-with-lease               # safer forced update (own branches only)
git branch -vv                            # ahead or behind

git tag -a v1.4.0 -m "Release 1.4.0"      # annotated tag
git push origin v1.4.0
git describe --tags                       # v1.4.0-12-g3f9c2ab
git log v1.3.0..v1.4.0 --oneline          # what is in the release
git tag --contains HASH                   # which releases hold this fix

git reflog                                # where HEAD has been
git branch rescue HASH                    # name a lost commit
git bisect start; git bisect bad; git bisect good v1.3.0
git bisect run ./test.sh                  # automatic search for the first bad commit
git fsck --lost-found                     # unreachable objects
git rm --cached FILE                      # stop tracking, keep the file

git clone --depth 1 URL                   # latest commit only
git clone --filter=blob:none URL          # fetch file contents on demand
git sparse-checkout set DIR1 DIR2         # check out only these folders
git worktree add ../hotfix hotfix/1.4     # second working folder
git submodule update --init --recursive
git count-objects -vH