-
Notifications
You must be signed in to change notification settings - Fork 47
Expand file tree
/
Copy pathdot_gitconfig
More file actions
56 lines (56 loc) · 972 Bytes
/
dot_gitconfig
File metadata and controls
56 lines (56 loc) · 972 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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
[user]
name = Oliver Caldwell
email = [email protected]
signingkey = "6DFA695F73832EF9DC0335C5D85B96510F2C8A64"
[core]
editor = nvim
excludesfile = ~/.gitexcludes
[color]
ui = true
[push]
default = simple
autoSetupRemote = true
[merge]
tool = vimdiff
[mergetool]
prompt = true
keepBackup = false
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[alias]
s = status -sb
sw = switch
b = branch
c = commit -v
a = add
re = restore
l = pull
p = push
f = fetch
mt = mergetool
m = merge
r = rebase
lg = log --stat
d = diff
dt = difftool
[commit]
gpgsign = true
[pull]
rebase = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[include]
path = ~/.gitconfig_local
[init]
defaultBranch = main
[diff]
tool = difftastic
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true