-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
31 lines (31 loc) · 902 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
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = Bahar Pourazar
email = [email protected]
[protocol]
version = 2
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = p4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
keepBackup = false
[diff]
# algorithm = patience
tool = p4mergetool
[difftool "p4mergetool"]
cmd = p4merge $REMOTE $LOCAL
[url "https://github.com/Shopify/"]
insteadOf = [email protected]:Shopify/
insteadOf = [email protected]:shopify/
insteadOf = ssh://[email protected]/Shopify/
insteadOf = ssh://[email protected]/shopify/
[core]
commitGraph = true
trustctime = false
[gc]
writeCommitGraph = true