-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
36 lines (36 loc) · 834 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
33
34
35
36
[user]
name = RobertAKARobin
email = [email protected]
[core]
excludesfile = ~/.gitignore_global
filemode = false
editor = vim
ignorecase = false
whitespace = -trailing-space,-space-before-tab,-indent-with-non-tab,-tab-in-indent,-cr-at-eol
[credentials]
username = robertakarobin
[push]
default = simple
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[mergetool]
prompt = false
keepBackup = false
[difftool]
prompt = true
[pull]
rebase = false
[init]
defaultBranch = main
[diff]
wsErrorHighlight = all
[merge "ours"]
driver = true