Created
October 22, 2014 14:46
-
-
Save swist/d3338566f7d153911688 to your computer and use it in GitHub Desktop.
git config settings
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
| [branch] | |
| autosetupmerge = true | |
| autosetuprebase = always | |
| [push] | |
| default = tracking | |
| [rerere] | |
| enabled =1 | |
| [merge "ours"] | |
| name = "Keep ours merge" | |
| driver = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment