Skip to content

Instantly share code, notes, and snippets.

@natlownes

natlownes/gist:1151730

Created August 17, 2011 15:11
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save natlownes/1151730 to your computer and use it in GitHub Desktop.
Save natlownes/1151730 to your computer and use it in GitHub Desktop.
Download ZIP
git merge cheatsheet. I can never remember the fuck these are.
Raw
gistfile1.txt
$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