Created
August 17, 2011 15:11
-
-
Save natlownes/1151730 to your computer and use it in GitHub Desktop.
git merge cheatsheet. I can never remember the fuck these are.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $LOCAL is set to the name of a temporary file containing the contents of the file on the current branch | |
| $REMOTE set to the name of a temporary file containing the contents of the file to be merged | |
| $BASE set to the name of a temporary file containing the common base for the merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment