1. Paul McLanahan
  2. dotfiles

Commits

Paul McLanahan  committed c7342b4

Add git config files.

  • Participants
  • Parent commits a80ea89
  • Branches default

Comments (0)

Files changed (2)

File dotfiles/.gitconfig

View file
  • Ignore whitespace
+[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

File dotfiles/.gitignore

View file
  • Ignore whitespace
+.idea/
+.DS_Store
+.svn
+Thumbs.db
+*~
+*.tmproj
+*.pyc
+working/
+*.log
+*.pot
+local_settings.py
+settings/local.py
+settings/sekrit.py