Last active
August 29, 2015 13:56
-
-
Save bbengfort/8797412 to your computer and use it in GitHub Desktop.
My system level git configuration.
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
[core] | |
editor = mvim -f | |
ui = true | |
excludesfile = /Users/benjamin/.gitignore | |
[user] | |
name = Benjamin Bengfort | |
email = benjamin@bengfort.com | |
[diff] | |
external = /Users/benjamin/bin/godiff.sh | |
[credential] | |
helper = osxkeychain |
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
.DS_Store | |
# Python binary and C extensions | |
*.py[cod] | |
*.so | |
# Other ignorables | |
*.old | |
*.orig | |
*.log | |
*.dat | |
*.bak | |
*~ | |
*.swp | |
*.db | |
_notes | |
# Packages | |
*.egg-info | |
dist | |
build | |
eggs | |
.installed.cfg | |
tmp | |
.idea |
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
#!/bin/sh | |
/usr/bin/opendiff "$2" "$5" -merge "$1" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment