-
Notifications
You must be signed in to change notification settings - Fork 10
/
Copy path.gitconfig
81 lines (80 loc) · 1.99 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
[alias]
br = branch
c = commit -am
co = checkout
cp = cherry-pick
df = diff --color --color-words --abbrev
dl = pull
f = "!git ls-files | grep -i"
ignored = ls-files -o -i --exclude-standard
la = "!git config -l | grep alias | cut -c 7-"
ll = log --color --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --numstat
ls = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
p = push
s = status -s
[color]
ui = always
[core]
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
autocrlf = input
[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
[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:"
[url "[email protected]:gilbarbara/"]
insteadOf = "git://github.com/gilbarbara/"
[user]
name = Gil Barbara
email = [email protected]
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[credential]
helper = osxkeychain
[push]
default = simple
[diff]
tool = kaleidoscope
[difftool]
prompt = false
[difftool "kaleidoscope"]
cmd = ksdiff \"$LOCAL\" \"$REMOTE\"
[merge]
log = true
tool = kaleidoscope
[mergetool]
keepBackup = false
[mergetool "kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true