-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
46 lines (46 loc) · 1.21 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
[user]
name = Chris Apple
email = cja-private@pm.me
[credential]
helper = osxkeychain
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[core]
autocrlf = input
excludesfile = ~/.gitignore
pager = delta --paging auto
#pager = delta --side-by-side --width $(expr ${COLUMNS} - 10) --wrap-max-lines unlimited
whitespace = trailing-space
[push]
default = current
autoSetupRemote = true
[difftool]
prompt = true
colorMoved = default
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[alias]
edit-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; nvim `f`"
add-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; git add `f`"
uncommit = reset --soft HEAD^
oneline = "log --oneline"
[merge]
conflictstyle = diff3
[log]
date = "local"
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false # required for git 2.37.0
[delta]
navigate = true # use n and N to move between diff sections
#side-by-side = true # side by side instead of interleaved
[init]
defaultBranch = main
[rerere]
enabled = true