Git Cheatsheet Git Cheatsheet

git reflog                        # HEAD's history
git reflog show main              # one branch's history
git reset --hard HEAD@{2}         # or address it by position
git fsck --lost-found             # when even the reflog has no entry

git revert <sha>                  # a new commit that undoes that one
git revert --no-commit <sha>      # stage the undo, commit it yourself
git revert -m 1 <merge-sha>       # undo a merge, keeping parent 1's line
git revert <old>..<new>           # a range, newest first

git merge main                    # a merge commit; history shows the branching
git rebase main                   # replays your commits on top; linear history
git rebase --continue             # after fixing a conflict
git rebase --abort                # back to where you started
git pull --rebase                 # the one to put in your config

git config --global pull.rebase true       # no more accidental merge commits
git config --global rebase.autoStash true  # stash and restore around a rebase

git rebase -i HEAD~5              # edit the last five
git rebase -i --root              # all of them

pick   a1b2c3d  Add parser
squash d4e5f6a  Fix typo in parser     # fold into the one above
reword 9f8e7d6  Add tests              # change the message
edit   1a2b3c4  Add validation         # stop here to amend
drop   5e6f7a8  Debug printf           # remove entirely

git bisect start
git bisect bad                    # current commit is broken
git bisect good v1.4.0            # this tag was fine
# git checks out the midpoint; test it, then:
git bisect good      # or: git bisect bad      # or: git bisect skip
git bisect reset                  # always, when you are done

git switch -c feature/x           # create and switch (clearer than checkout)
git switch -                      # back to the previous branch
git branch -vv                    # local branches + their upstreams
git branch --merged main          # safe to delete
git branch -d old                 # delete if merged; -D to force
git push origin --delete old      # delete it on the remote too
git fetch --prune                 # drop local refs to branches deleted upstream

git stash push -m "wip: parser"   # -m, so it is findable later
git stash push -u                 # include untracked files
git stash push path/to/file       # only part of the tree
git stash list
git stash show -p stash@{1}       # what is actually in it
git stash pop                     # apply and drop
git stash apply stash@{1}         # apply and keep
git stash branch fix stash@{0}    # new branch from where it was stashed

git cherry-pick <sha>             # that commit, onto the current branch
git cherry-pick <a>^..<b>         # an inclusive range
git cherry-pick -x <sha>          # record the source sha in the message
git cherry-pick -n <sha>          # stage it without committing
git cherry-pick --abort

git log --oneline --graph --decorate --all     # the shape of everything
git log -p path/to/file                        # every change to one file
git log -S "functionName"                      # commits that added or removed a string
git log --since="2 weeks" --author="Karan"
git show <sha>                                 # one commit in full
git blame -L 40,60 file                        # who last touched these lines
git diff main...feature                        # what the branch adds (merge-base)
git diff --staged                              # what is about to be committed

git worktree add ../hotfix hotfix/urgent    # existing branch
git worktree add -b fix/x ../fix main       # new branch from main
git worktree list
git worktree remove ../hotfix
git worktree prune                          # clean up deleted ones

git commit --amend                # message and/or staged changes
git commit --amend --no-edit      # just fold in what is staged
git commit --fixup <sha>          # mark it as fixing an older commit
git rebase -i --autosquash HEAD~5 # and fold all fixups in automatically