-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
44 lines (44 loc) · 1.09 KB
/
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
32
33
34
35
36
37
38
39
40
41
42
43
44
[user]
email = [email protected]
name = Christopher Dignam
signingkey = 4DCE0863DD64E6D0
[core]
editor = vim
autocrlf = false
excludesfile = /Users/chris/.gitignore
attributesfile = ~/.gitattributes
pager = diff-so-fancy | less --tabs=4 -RFX
[push]
default = simple
[color]
ui = auto
[merge]
tool = smerge
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[diff-so-fancy]
stripLeadingSymbols = false
[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
[github]
user = chdsbd
[ghi]
token = !security find-internet-password -a chdsbd -s github.com -l 'ghi token' -w
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[pull]
ff = true
[fetch]
prune = true