Joseph Paul

Joseph Paul

Personal GIT cheatsheet

January 25, 2017 #hack

Commands i rarely use and therefore hardly remember.

Here's a more excessive list of less common git operations: github.com/k88hudson/git-flight-rules

Reset specific path to specific commit

git checkout $id $path

Create inverse of a commit to undo its changes

git revert $id
git revert $id -n  # Don't commit

Prefer current branch on merge conflicts

git merge -s ours $branch

Prefer remote when pulling

git pull -s recursive -X theirs

Create patch from a commit

git format-patch -1 $id