-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
29 lines (29 loc) · 865 Bytes
/
Copy pathgitconfig
File metadata and controls
29 lines (29 loc) · 865 Bytes
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
# vi: set ft=gitconfig
[user]
name = kthwaite
email = 28732700+kthwaite@users.noreply.github.com
[init]
defaultBranch = main
[core]
editor = nvim
[diff]
algorithm = patience
compactionHeuristic = true
tool = nvimdiff
[difftool "nvimdiff"]
cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
[branch]
sort = -committerdate
[merge]
tool = nvimdiff4
prompt = false
[mergetool "nvimdiff4"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'set diffopt&' -c 'set diffopt+=algorithm:patience'
keepBackup = false
[pull]
rebase = false
[alias]
orig = remote get-url --all origin
lg = log --graph --pretty=oneline --abbrev-commit
lgp = log --oneline --decorate --all --graph
lgm = log --pretty=format:'• %C(bold yellow)%h%C(reset) %C(red)%an%C(reset) %C(blue)%ai%C(reset) %C(bold red)%D%C(reset) | %s'