-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
75 lines (60 loc) · 1.47 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
[alias]
br = branch
ci = commit
co = checkout
df = diff
dl = diff --name-only
do = diff origin/master
ds = diff --staged
ks = difftool
nb = new-branch
ru = rebase-update
sb = squash-branch
st = status
conflicts = diff --name-only --diff-filter=U
cpick = cherry-pick
remaster = rebase --onto origin/master origin/master
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
[color]
ui = true
branch = auto
diff = auto
status = auto
[core]
quotepath = false
autocrlf = false
filemode = false
excludesfile = /Users/louis/.gitignore
deltaBaseCacheLimit = 1G
attributesfile = /Users/louis/.gitattributes
[diff]
tool = Kaleidoscope
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
[diff "plist"]
textconv = plutil -convert xml1 -o -
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[format]
pretty = format:"%Cred%h%Creset %ad%Cgreen%d%Creset %Cred%an%Creset %s"
[help]
autocorrect = -1
[log]
date = local
[merge]
conflictstyle = diff3
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[user]
name = Louis Romero
email = [email protected]