-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
31 lines (31 loc) · 964 Bytes
/
gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
[core]
editor = vim
excludesfile = /Users/mattgarrison/.gitignore_global
[diff]
tool = vimdiff
[difftool]
prompt = false
[alias]
d = difftool
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
[merge]
tool = diffmerge
[difftool "vimdiff"]
cmd = vimdiff $LOCAL $REMOTE
[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
[user]
email = mattsgarrison@gmail.com
name = Matt Garrison
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[mergetool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true