-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig
80 lines (79 loc) · 1.52 KB
/
dot_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
[user]
name = Joakim L. Engeset
email = joakim.engeset@gmail.com
signingKey = joakim.engeset@gmail.com
[github]
user = joakimen
[core]
autocrlf = input
editor = nvim
[diff]
tool = vimdiff
colorMoved = zebra
[difftool]
prompt = false
trustExitCode = true
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $BASE
[merge]
tool = vimmerge
[mergetool]
prompt = false
[mergetool "vimmerge"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[alias]
a = add
b = branch
c = commit
ca = commit --amend
cm = commit -m
co = checkout
cv = commit --verbose
cp = cherry-pick
d = difftool
ds = difftool --staged
df = diff
l = log --graph --decorate --oneline
ll = log --name-status --graph
ls = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ld = ls-files -d
lm = ls-files -m
m = merge
pl = pull
ps = push
f = fetch
s = status --short
untracked = ls-files --others --exclude-standard
se = secret
z = stash
zl = stash list
zp = stash pop
zd = stash drop
root = rev-parse --show-toplevel
curbranch = rev-parse --abbrev-ref @
[web]
browser = open
[credential]
helper = store
[diff "sopsdiffer"]
textconv = sops -d
[push]
default = current
autoSetupRemote = true
[pull]
default = current
rebase = true
[fetch]
prune = true
[init]
defaultBranch = main
; templateDir = ~/.git-templates
[commit]
gpgSign = true
# host-specific
[include]
path = ~/.gitconfig-local
;[blame]
;ignoreRevsFile = .git-blame-ignore-revs
[rebase]
autoStash = true