Created
January 14, 2012 19:21
-
-
Save cbrammer/1612579 to your computer and use it in GitHub Desktop.
Basic Global Git Ignore and Config
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
[color] | |
diff = auto | |
status = auto | |
branch = auto | |
[diff] | |
tool = p4merge | |
[core] | |
excludesfile = ~/.gitignore | |
editor = mate -w | |
[user] | |
email = YOUR EMAIL ADDRESS --------------------------------- | |
name = YOUR NAME ------------------------------------------ | |
[merge] | |
tool = p4merge | |
[difftool] | |
prompt = false | |
[mergetool] | |
trustExitCode = true | |
prompt = false | |
keepBackup = false | |
keepTemporaries = false | |
[difftool "p4merge"] | |
cmd = p4merge $BASE $LOCAL $REMOTE $MERGED | |
path = /Applications/p4merge.app/Contents/MacOS/p4merge | |
[mergetool "p4merge"] | |
path = /Applications/p4merge.app/Contents/MacOS/p4merge | |
cmd = p4merge $BASE $LOCAL $REMOTE $MERGED | |
[alias] | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | |
[branch] | |
autosetuprebase = local |
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
###################### | |
# Windows | |
###################### | |
# Windows image file caches | |
Thumbs.db | |
# Folder config file | |
Desktop.ini | |
###################### | |
# OSX | |
###################### | |
.DS_Store | |
.svn | |
# Thumbnails | |
._* | |
# Files that might appear on external disk | |
.Spotlight-V100 | |
.Trashes | |
###################### | |
# Eclipse | |
###################### | |
*.pydevproject | |
.project | |
.metadata | |
bin/** | |
tmp/** | |
tmp/**/* | |
*.tmp | |
*.bak | |
*.swp | |
*~.nib | |
local.properties | |
.classpath | |
.settings/ | |
.loadpath | |
# External tool builders | |
.externalToolBuilders/ | |
# Locally stored "Eclipse launch configurations" | |
*.launch | |
# CDT-specific | |
.cproject | |
# PDT-specific | |
.buildpath |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment