-
Notifications
You must be signed in to change notification settings - Fork 16
/
Copy pathgitconfig
150 lines (126 loc) · 3.42 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
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
; vim: ft=gitconfig
[init]
defaultBranch = main
[push]
default = tracking
autoSetupRemote = true
followTags = true
[color]
ui = true
[alias]
aa = add --all
ap = add --patch
authors = shortlog -s -n -e
branches = "for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes"
cob = !"git checkout $(git for-each-ref --sort='-authordate:iso8601' --format=' %(authordate:relative)%09%(refname:short)' refs/heads | fzf | cut -f2)"
ci = commit -v
clear = clean -id
co = checkout
aa = add -A .
# add untracked files
an = add -N .
st = status
cp = cherry-pick
put = push origin HEAD
fixup = commit --fixup
squash = commit --squash
doff = reset HEAD^
ri = rebase --interactive
br = branch
pruneremote = remote prune origin
tree = log --graph --oneline --decorate --color --all
tr = log --graph --oneline --decorate --color
add-untracked = !"git status --porcelain | awk '/\\?\\?/{ print $2 }' | xargs git add"
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
reset-authors = commit --amend --reset-author -CHEAD
[core]
excludesfile = ~/.gitignore
autocrlf = input
whitespace = warn
pager = delta
[delta]
navigate = true
light = false
side-by-side = true
line-numbers = true
features = tokyonight
hyperlinks = true
[delta "tokyonight"]
dark = true
line-numbers = true
side-by-side = false
keep-plus-minus-markers = false
syntax-theme = Monokai Extended Origin
file-style = bold
file-decoration-style = ul
file-added-label = [+]
file-copied-label = [==]
file-modified-label = [*]
file-removed-label = [-]
file-renamed-label = [->]
minus-style = syntax "#3a273a"
minus-non-emph-style = syntax "#3a273a"
minus-emph-style = syntax "#6b2e43"
minus-empty-line-marker-style = syntax "#3a273a"
line-numbers-minus-style = "#b55a67"
plus-style = syntax "#273849"
plus-non-emph-style = syntax "#273849"
plus-emph-style = syntax "#305f6f"
plus-empty-line-marker-style = syntax "#273849"
line-numbers-plus-style = "#627259"
line-numbers-zero-style = "#3b4261"
[merge]
; ff = only
summary = true
tool = nvimdiff
conflictstyle = zdiff3
[merge "bundlelock"]
name = lock Gemfile
driver = bundle install
[merge "bundle"]
name = bundle
driver = bundle
[merge "npm-merge-driver"]
name = automatically merge npm lockfiles
driver = npx npm-merge-driver merge %A %O %B %P
[merge "yarn-merge-driver"]
name = automatically merge yarn lockfiles
driver = npx npm-merge-driver merge %A %O %B %P -c yarn
[commit]
template = ~/.gitmessage
verbose = true
[fetch]
prune = true
pruneTags = true
all = true
[rebase]
autosquash = true
autoStash = true
updateRefs = true
[rerere]
enabled = true
autoupdate = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[branch]
sort = -committerdate
autosetuprebase = always
[tag]
sort = version:refname
[help]
autocorrect = prompt
[interactive]
diffFilter = delta --color-only
singlekey = true
[diff]
algorithm = histogram
colorMoved = plain
[pull]
rebase = true
; Load local configs.
; https://git-scm.com/docs/git-config#_includes
[include]
path = ~/.gitconfig.local