-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
114 lines (103 loc) · 2.3 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
; vim: ts=4 sw=4 sts=4 noexpandtab
[color]
diff = auto
branch = auto
ui = auto
status = auto
interactive = auto
[core]
editor = ${EDITOR:-vim}
pager = delta
excludesfile = ~/.gitignore
bigFileThreshold = 256m
compression = 1
losecompression = 1
autocrlf = false
[log]
abbrevCommit = 8
[alias]
b = branch
ba = branch --all
bd = branch -d
bD = branch -D
find = branch --contains
ci = commit
ca = commit --amend
co = checkout
conflicts = diff --name-only --diff-filter=U
d = diff
dc = diff --cached
dno = diff --name-only
hide = stash
l = log
log1 = log -1
logc = log ORIG_HEAD.. --stat --no-merges
# https://coderwall.com/p/euwpig/a-better-git-log
logg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr)%Creset - %C(bold blue)%an%Creset' --abbrev-commit
loga = log --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cd)%Creset - %C(bold blue)%an%Creset' --abbrev-commit
logo = log --pretty=oneline --abbrev-commit
logs = log --stat
puta = push --tags
ra = rebase --abort
rc = rebase --continue
ri = rebase -i
s = status -sb
sno = status -sb -uno
spo = stash pop
st = status
sw = switch
sup = !git stash && git up
up = pull --rebase
fep = fetch --prune
fea = fetch --all
fet = fetch --tags
merge-log = !sh -c 'git log --stat $1^..$1' -
mt = mergetool
[interactive]
diffFilter = delta --color-only
[delta]
features = hoopoe
; features = tangara-chilensis
; features = calochortus-lyallii
[delta "decorations"]
commit-decoration-style = red box ul
file-style = bold blue ul
file-decoration-style = none
commit-style = magenta
; commit-decoration-style = magenta box ul
[diff]
compactionHeuristic = true
mnemonicprefix = true
colorMoved = default
[merge]
tool = vimdiff
conflictstyle = diff3
[push]
default = current
[credential]
helper = cache
[advice]
statusHints = false
[help]
autocorrect = 1
[branch]
autosetuprebase = always
sort = -committerdate
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[include]
path = ~/.gitconfig.local
path = ~/.config/delta/themes.gitconfig
[init]
defaultBranch = main
[rerere]
enable = true
[column]
ui = auto
[fetch]
writeCommitGraph = true
[commit]
gpgsign = true