-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
115 lines (81 loc) · 1.98 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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
[include]
path = ~/.gitconfig.local
[push]
default = simple
[color]
ui = auto
interactive = auto
[diff]
tool = nvimdiff
compactionHeuristic = true
[difftool]
prompt = false
[difftool "nvimdiff"]
cmd = "nvim -R -d -c \"wincmd l\" -d \"$LOCAL\" \"$REMOTE\""
[merge]
tool = nvimdiff
[mergetool]
prompt = false
[mergetool "nvimdiff"]
cmd = "nvim -d -c \"4wincmd w | wincmd J\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\""
[github]
user = rinx
[core]
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes_global
pager = delta
[interactive]
diffFilter = delta --color-only --features=interactive
[delta]
features = decorations
line-numbers = true
side-by-side = false
[delta "interactive"]
keep-plus-minus-markers = false
[delta "decorations"]
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
[alias]
st = status -s -b
l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
ll = log --graph --stat --abbrev-commit
ad = add
cm = commit --signoff
ca = commit --signoff --amend --no-edit
cae = commit --signoff --amend
ps = push
psf = push --force-with-lease --force-if-includes
psa = push --all
pl = pull
co = checkout
sw = switch
rs = restore
br = branch
sb = show-branch
[url "https://"]
insteadOf = git://
[credential]
helper = store --file ~/.git-credentials
helper = cache --timeout=360000
[pull]
ff = only
[submodule]
recurse = true
[ghq]
root = ~/local/src
[rerere]
enabled = true
[fetch]
prune = true
[init]
defaultBranch = main
[commit]
template = ~/.commit_template
[rebase]
autosquash = true
# vim: set ft=gitconfig: