-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
61 lines (61 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
[alias]
c = commit -am
up = pull
p = push
s = status
df = diff --color --color-words --abbrev
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
[color]
ui = always
[core]
excludesfile = /Users/$USER/.gitignore
attributesfile = ~/.gitattributes
editor = atom -n -w
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
log = true
tool = opendiff
keepBackup = false
keepTemporaries = false
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
[user]
name = Ollo
email = [email protected]
[mergetool]
keepBackup = false
keepTemporaries = false
[push]
default = simple
[diff]
tool = opendiff
[help]
autocorrect = 1
[difftool "opendiff"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "opendiff"]
cmd = /usr/bin/opendiff \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true