-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
91 lines (75 loc) · 1.51 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
[user]
name = Duff OMelia
email = [email protected]
signingkey = 30AB6678
[color]
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
aa = add --all
b = branch -a -vv
d = diff
di = diff
div = divergence
dc = diff --cached
co = checkout
cm = commit
ff = merge --ff-only
l = "!pretty_git_log"
la = !git l --all
r = !git l -38
ra = !git r --all
ps = push
s = status
rmd = rm `git ls-files --deleted`
ctags = !.git/hooks/ctags
[apply]
whitespace = nowarn
[branch]
autosetupmerge = true
[merge]
tool = Kaleidoscope
[push]
default = simple
[github]
user = duff
[init]
templatedir = ~/.git_template
defaultBranch = master
[core]
excludesfile = /Users/duff/.gitignore
editor = nvim
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool]
prompt = false
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process