Paul McLanahan avatar Paul McLanahan committed c7342b4

Add git config files.

Comments (0)

Files changed (2)

dotfiles/.gitconfig

+[user]
+	name = Paul McLanahan
+	email = paul@mclanahan.net
+
+[alias]
+    co = checkout
+    ci = commit
+    st = status
+    su = submodule update --init --recursive
+
+[core]
+	excludesfile = /Users/pmclanahan/.gitignore
+
+[color]
+    diff = auto
+    status = auto
+    branch = auto
+
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

dotfiles/.gitignore

+.idea/
+.DS_Store
+.svn
+Thumbs.db
+*~
+*.tmproj
+*.pyc
+working/
+*.log
+*.pot
+local_settings.py
+settings/local.py
+settings/sekrit.py
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.