-
Notifications
You must be signed in to change notification settings - Fork 0
/
dot_gitconfig.tmpl
114 lines (91 loc) · 2.52 KB
/
dot_gitconfig.tmpl
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
[core]
autocrlf = input
editor = nvim
excludesfile = ~/.gitignore_global
; pager = /usr/share/git/diff-highlight/diff-highlight | less -RFX
pager = delta
; pager = delta --keep-plus-minus-markers --theme='zenburn'
; pager = diff-so-fancy | less -RFX
[user]
name = {{ .git.name }}
email = {{ .git.email }}
signingkey = {{ .git.signingkey }}
[alias]
fork-point = !bash -c 'diff -u <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
get-branch = !bash -c 'git branch -ra | grep -i $1' -
lg = !git lg1
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset) %C(bold yellow)%d%C(reset)' --branches --remotes --tags
lg2 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset) %C(bold yellow)%d%C(reset)' --all
patch = !git --no-pager diff --no-color
permission-reset = !git diff -p -R | grep -E \"^(diff|(old|new) mode)\" | git apply
no-ci-push = push -o ci.skip
[credential]
helper = cache --timeout=3600
[init]
defaultBranch = main
[commit]
{{- if .git.signingkey }}
gpgsign = true
{{- end }}
verbose = true
[gpg]
program = gpg
{{- if .git.signingkey }}
[tag]
forceSignAnnotated = true
gpgSign = true
{{- end }}
[format]
coverFromDescription = auto
coverLetter = auto
signOff = true
[fetch]
prune = true
[pull]
rebase = merges
[push]
default = simple
[merge]
autoStash = true
conflictstyle = diff3
ff = false
log = true
tool = nvimdiff
[mergetool]
prompt = true
[mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[diff]
colorMoved = default
renames = copies
tool = nvimdiff
[difftool]
prompt = true
[difftool "nvimdiff"]
cmd = nvim -d $LOCAL $REMOTE -c '$wincmd w' -c 'wincmd L'
[interactive]
diffFilter = delta --color-only --hunk-header-style raw
[color]
ui = true
[color "diff"]
commit = yellow bold
frag = magenta bold
meta = 11
new = green bold
old = red bold
; whitespace = red reverse
[diff-so-fancy]
changeHunkIndicators = false
markEmptyLines = false
stripLeadingSymbols = false
useUnicodeRuler = false
[delta]
color-only = true
hunk-header-style = syntax
line-numbers = true
minus-style = syntax "#3f0001"
; side-by-side = true
syntax-theme = Monokai Extended
whitespace-error-style = normal
[rebase]
autoStash = true