-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
32 lines (32 loc) · 793 Bytes
/
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
[user]
email = calamity@chromium.org
name = Christopher Lam
[core]
autocrlf = false
filemode = false
deltaBaseCacheLimit = 1G
mergeoptions = --no-edit
[merge]
conflictstyle = diff3
tool = vscode
[branch]
autosetupmerge = always
skip-deps-uploads = True
[branch "branch_name"]
skip-deps-uploads = True
[alias]
serve = daemon --verbose --export-all --base-path=src.git --reuseaddr --strict-paths --enable=receive-pack src.git/
[push]
default = simple
[http]
cookiefile = /usr/local/google/home/calamity/.gitcookies
[multidiff]
tool = gvim "+syntax on" "+colorscheme jellybeans2" "+set termguicolors" -c 'silent call TabMultiDiff()' -f
[mergetool "vscode"]
cmd = code $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = ~/fun/codediff.sh $LOCAL $REMOTE
[color]
ui = auto