1[user]
 2    # Identify me as a user on git.
 3	email = seanerikoconnor@gmail.com
 4	name = Sean E. O'Connor
 5
 6[core]
 7    # I use the Vim editor.
 8	editor = vim
 9	excludesfile = /Users/seanoconnor/.gitignore_global
10
11[merge]
12    # I use Apple opendiff.
13	tool = opendiff
14	conflictstyle = diff3
15
16[difftool]
17  prompt = false # Don't prompt the user to hit RETURN before the next file difference.
18
19[difftool "opendiff"]
20    #  cmd = echo 'base(ancestor base for the merge) = ' \"$BASE\" 'local(file on current branch) 
21    #= ' \"$LOCAL\" 'remote(file to be merged) = ' \"$REMOTE\"  'merged(what mergetool should write) = ' \"$MERGED\"
22    cmd = opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\"
23
24[mergetool "opendiff"]
25	cmd = opendiff \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
26	trustExitCode = true
27
28[push]
29	default = simple
30
31[credential]
32	helper = cache
33
34[alias]
35    # Custom shorthands for commands.
36	unstage = reset HEAD --
37	uncheckin = checkout --
38    
39[difftool "sourcetree"]
40    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
41	path = 
42
43[mergetool "sourcetree"]
44	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
45	trustExitCode = true
46
47[commit]
48	template = /Users/seanoconnor/.stCommitMsg