Skip to content

Instantly share code, notes, and snippets.

@veselosky

veselosky/gitconfig

Created March 22, 2012 20:26
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save veselosky/2163585 to your computer and use it in GitHub Desktop.
Save veselosky/2163585 to your computer and use it in GitHub Desktop.
Download ZIP
If you use rebase in your workflow, put this in your gitconfig
Raw
gitconfig
[branch]
autosetupmerge = true
autosetuprebase = remote
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment