-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
54 lines (41 loc) · 900 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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
[user]
name = Alistair McKelvie
[core]
pager = delta
editor = nvim
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
tool = difftastic
[push]
default = current
[pull]
ff = only
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[alias]
lo = log --all --decorate --oneline --graph
st = status
ci = commit
sw = switch
br = branch
co = checkout
fp = push --force-with-lease
rb = rebase
[include]
path = .gitconfig.local