-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
113 lines (85 loc) · 2.17 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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
[user]
name = Mark Adams
email = [email protected]
[github]
user = hyperspacemark
[core]
excludesfile = ~/.gitignore
editor = vim
autocrlf = false
pager = diff-so-fancy | less --tabs=4 -RFX
attributesfile = /Users/Mark/.gitattributes
[color]
ui = true
[format]
pretty = %C(yellow)%h%Cblue%d%Creset %s - %C(white)%an %Cgreen(%cr)%Creset
[status]
submodule = 1
[fetch]
prune = true
[pull]
rebase = true
[push]
default = current
[tag]
sort = v:refname
[rebase]
autosquash = true
autostash = true
[diff]
tool = Kaleidoscope
indentHeuristic = on
renames = copies
algorithm = histogram
[diff "plist"]
textconv = plutil -convert xml1 -o -
[diff "mobileprovision"]
textconv = openssl smime -inform der -verify -in
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
conflictStyle = diff3
[mergetool]
keepBackup = false
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[apply]
whitespace = warn
[help]
autocorrect = 1
[credential]
helper = osxkeychain
[alias]
create-branch = !sh -c 'git push origin HEAD:refs/heads/$1 && git fetch origin && git branch --track $1 origin/$1 && cd . && git checkout $1' -
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git remote prune origin && git branch -D $1' -
delete-tag = !sh -c 'git tag -d $1 && git push origin :refs/tags/$1' -
checkout-pr = !sh -c 'git fetch origin pull/$1/head:pr-$1 && git checkout pr-$1' -
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
# Github for Mac
[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
process = git-lfs filter-process
required = true
# Hub
[hub]
host = github.braintreeps.com
protocol = https
[filter "fix-eol-eof"]
clean = fixup-eol-eof
smudge = cat
required = true
[http]
cookiefile = /Users/markadams/.gitcookies