Cheatsheet for Git commands

git-cheatsheet.md

Resolve conflicts using local modifications

git fetch origin master
git rebase -X theirs

theirs means ours in the case of a rebase (inverse of git merge).

Double-dash

Means the end of command options, after which only positional parameters are accepted.

Move files from one repo to another

Text and binary files will be created and commits are also moved with their author dates kept.

git log -p --pretty=email --binary --reverse > <patch-file>
git am --directory=<directory> <patch-file>

Change order of commits

git rebase -i HEAD~5
Use vim to move commit