Skip to content

Instantly share code, notes, and snippets.

@shana
Created October 30, 2016 12:25
Show Gist options
  • Save shana/29ca8f52c03740aa42fc81b56d71de05 to your computer and use it in GitHub Desktop.
Save shana/29ca8f52c03740aa42fc81b56d71de05 to your computer and use it in GitHub Desktop.
Git Configuration
[rerere]
enabled = true
[push]
default = tracking
[branch]
autosetuprebase = always
[apply]
whitespace = strip
[diff]
color = auto
rename = copy
tool = bc3
[merge]
tool = bc3
[mergetool]
bc3 = trustExitCode
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment