-
Notifications
You must be signed in to change notification settings - Fork 8
/
gitconfig
95 lines (71 loc) · 1.35 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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
[user]
name = Casey Rodarmor
email = [email protected]
signingkey = 3259DAEDB29636B0E2025A70556186B153EC6FE0
[github]
user = casey
[init]
defaultBranch = master
[color]
branch = auto
diff = auto
status = auto
ui = true
[core]
autocrlf = false
excludesfile = ~/.gitignore.global
pager = delta
quotepath = false
trustctime = false
[alias]
co = checkout
[branch "master"]
merge = refs/head/master
remote = origin
[credential]
helper = osxkeychain
[push]
default = current
[pull]
default = current
rebase = true
[merge]
conflictstyle = zdiff3
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
trustExitCode = true
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output = \"$PWD/$MERGED\"
trustExitCode = true
[commit]
verbose = true
[gpg]
program = gpg
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[http]
cookiefile = ~/.gitcookies
[fetch]
prune = true
[rebase]
autoStash = true
[advice]
skippedCherryPicks = false