Created
April 13, 2010 14:53
-
-
Save jlindley/364701 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| # 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