Skip to content

Instantly share code, notes, and snippets.

@jlindley

jlindley/git_setup.sh

Created April 13, 2010 14:53
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 jlindley/364701 to your computer and use it in GitHub Desktop.
Save jlindley/364701 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git_setup.sh
# new branches appropriately merge from the starting point branch
git config --global branch.autosetupmerge true
# pull from origin and merge by default
git config --global branch.master.remote origin
git config --global branch.master.merge refs/heads/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment