-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
129 lines (107 loc) · 2.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
116
117
118
119
120
121
122
123
124
125
126
127
128
129
[advice]
pushUpdateRejected = false
statusHints = false
commitBeforeMerge = false
[alias]
st = status
d = diff
dc = diff --cached
ci = commit -v
cim = commit -v -m
cia = commit -v -a
ciam = commit -v -a -m
co = checkout
cp = cherry-pick
l = log
ll = log -p
lm = log master..
llm = log -p master..
b = branch
rb = rebase
sh = !git-sh
stag = "!id=$(git rev-parse --verify HEAD); git tag -s user_${id:0:8} -m \"Tag for commit $id\""
vtag = !git tag -v $(git describe)
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
[branch]
autosetuprebase = always
autosetupmerge = true
[color]
diff = auto
branch = auto
status = auto
sh = auto
ui = auto
[commit]
gpgsign = true
template = ~/.gitmessage
[core]
excludesfile = ~/.gitignore_global
attributesfile = ~/.gitattributes
pager = delta
# tabwidth: replace tabs with this many spaces
# tab-in-indent: tabs in indentation as error
# blank-at-eol: whitespace at end of line as error
# blank-at-eof: whitespace at end of file as error
# space-before-tab: looks for spaces before tabs at the beginning of a line
whitespace = tabwidth=4,tab-in-indent,-indent-with-non-tab,trailing-space,blank-at-eol,blank-at-eof
[delta]
# use n and N to move between diff sections
navigate = true
# set to true for terminals with light background color
light = false
# do not use most for pager, it doesn't handle color properly
# https://github.com/dandavison/delta/issues/1490
pager = less
[diff]
algorithm = histogram
colorMoved = default
renames = true
mnemonicprefix = true
[diff "sqlite3"]
binary = true
textconv = "echo .dump | sqlite3"
[github]
user = haplo
password =
oauth-token =
[gitlab]
user = haplo
[include]
path = ~/.gitconfig_local
[init]
defaultBranch = main
[interactive]
diffFilter = "delta --color-only"
[merge]
conflictstyle = zdiff3
tool = emerge
[push]
default = tracking
[rerere]
enabled = true
# Always pull to Github and Gitlab with HTTPS, push with SSH
# pushInsteadOf rewrites push URLs first, and if theres a match it prevents an insteadOf
# from rewritting
# https://stackoverflow.com/a/71971739
[url "https://github.com/"]
insteadOf = "[email protected]:"
[url "[email protected]:"]
pushInsteadOf = "https://github.com/"
pushInsteadOf = "[email protected]:"
[url "https://gitlab.com/"]
insteadOf = "[email protected]:"
[url "[email protected]:"]
pushInsteadOf = "https://gitlab.com/"
pushInsteadOf = "[email protected]:"
[user]
name = Fidel Ramos
email = [email protected]
signingkey = 379F14BB02F9317F
# configuration overrides, must be at the bottom
# https://blog.jannikwempe.com/git-config-includes
[includeIf "gitdir/i:~/Code/archlinux/"]
path = ~/Code/archlinux/gitconfig
[includeIf "gitdir/i:~/Code/openwebconsulting/"]
path = ~/Code/openwebconsulting/gitconfig