-
Notifications
You must be signed in to change notification settings - Fork 3
/
.gitconfig
144 lines (143 loc) · 3.8 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
[http]
sslVerify = true
cookiefile = ~/.gitcookies
[color]
ui = true
status = auto
diff = auto
branch = auto
grep = auto
[color "diff-highlight"]
oldNormal = red
oldHighlight = 160 bold white
newNormal = green
newHighlight = 65 bold white
[grep]
lineNumber = true
[alias]
ad = !git add $@ && git st
ap = add -p
br = branch
ca = commit --amend
caa = commit --amend --reuse-message HEAD
cf = clean -df
cm = commit
cn = clean -dn
co = checkout
cp = cherry-pick
dc = diff -w --diff-algorithm=default --cached
dh = diff -w --histogram
dhc = diff -w --color-words --histogram
di = diff -w --diff-algorithm=default
dic = diff -w --color-words --diff-algorithm=default
dn = diff --name-only
dp = diff -w --patience
dpc = diff -w --color-words --patience
dt = difftool
ll = log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short
lo = log --decorate --graph --name-status --oneline
po = pull origin master
pu = !git push origin $(git rev-parse --abbrev-ref HEAD)
pul = !git stash && git pull && git stash pop
re = remote
rh = reset --hard
rl = reflog
ri = rev-list --pretty --oneline
rt = revert
rv = remote -v
ra = remote-add
sm = submodule
st = status -sb
su = !git br --set-upstream-to=origin/$(git rev-parse --abbrev-ref HEAD)
sd = !git br --set-upstream-to=delphinus/$(git rev-parse --abbrev-ref HEAD)
# \x23 means `#`
ds = !git st --porcelain | grep -v '^[AMD]' | grep -v '^\\x23' | perl -pe 's/^UU\\s+//'
wk = worktree
clean-local = !git branch --merged | egrep -v '(^\\*|master|main)' | xargs git branch -d
show-name = diff-tree --no-commit-id --name-only -r
[url "git@github.com:"]
pushInsteadOf = "git://github.com/"
pushInsteadOf = "https://github.com/"
[user]
email = me@delphinus.dev
name = delphinus
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACxEJ/p67umFPAPtnLFo4t3aDFfAV5iuOybn3c8Z1dx
[github]
[core]
excludesfile = ~/git/dotfiles/.gitignore-global
attributesfile = ~/git/dotfiles/.gitattributes
autocrlf = false
quotepath = false
editor = vim
pager = delta
[github]
user = delphinus
[pull]
rebase = true
[rebase]
autosquash = true
[tig]
tab-size = 4
line-graphics = utf-8
main-view = line-number:no,interval=5 id:yes date:default author:full commit-title:yes,graph,refs,overflow=no
diff-highlight = true
mouse = true
[tig "bind"]
generic = G none
main = R !git rebase -i %(commit)
main = D !git difftool %(commit)~ %(commit)
main = Y @sh -c 'printf %s %(commit) | pbcopy'
[pager]
branch = false
[interactive]
diffFilter = delta --color-only
[ghq]
root = ~/.cache/dein/repos
root = ~/.local/share/nvim/site/pack
root = ~/.local/share/nvim/lazy
root = ~/git
[ghq "ssh://git@git.remora.cx"]
vcs = git
[ghq "ssh://git@git.delphinus.dev"]
vcs = git
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[include]
path = .gitconfig_local
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[diff]
algorithm = histogram
renames = true
indentHeuristic = true
colorMoved = dimmed_zebra
tool = nvimdiff
[difftool "nvr"]
cmd = nvr -s -d $LOCAL $REMOTE
[difftool "nvimdiff"]
cmd = nvim -R -d -c 'wincmd l | nnoremap q <Cmd>qa<CR>' -d $LOCAL $REMOTE
[merge]
ff = false
tool = nvimdiff
[mergetool "nvr"]
cmd = nvr -s -d $LOCAL $BASE $REMOTE $MERGED -c 'wincmd J | wincmd ='
[mergetool "nvimdiff"]
cmd = nvim -d -c '4wincmd w | wincmd J | nnoremap q <Cmd>qa<CR>' $LOCAL $BASE $REMOTE $MERGED
[commit]
template = ~/git/dotfiles/commit-template.txt
[init]
defaultBranch = main
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
syntax-theme = Nord
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
line-numbers-left-format = {nm:^4}⡇
# vim:se noet: