-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
105 lines (103 loc) · 3.5 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
[user]
name = Veit Lehmann
email = [email protected]
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCojVAWCkauwifJ2hMwk2FNIAOuwfEi8TGrTZjSFNbJaDRigS2N4NeAQkB7aWNoLWOuviQxjrvF8sKfU93ahdIu5n9VnclkqdyCsmoGGO7DyM2pIyMQ14awDpjnsBw/MTFiB/QxNcAx8P63/FmZ/3zyaLGEK86nwYxZ2JmX/oh9aBGOdutuSKxqxv0QbWEkh2RYuzMt8ZXsxxKFwN8pRGNZa997d0YeNlWS3jKwbcniq4V1G2ouVIEtOCwW2A/4k7J1RpnG77kNp5JTv4mq7ayD7UFfwNjmd2aAwfLsCDieVeabWyZHwHtN21rjY/Zaw+Powuz6zvfuC02Pf4TUyC8lqBGVDS58m/lC/YwMKJoEYB325ZJNZ7i2J/tNLD+r9L272Z99TOcK5gYQcd06aY/8QLA6vLpRs4jbNbM0ND+7RcD3rEMpvrEe9vg0vyVj5N99dncIR+/nTKQevci5HT914hoNlZ+RW+WAlrMYPA0F40hpkfDFx3Yavfbvgp8B/jrXisaL9pV/RhQPRyJxRc9TO/AWeuKA8MLXqlhncp7e3MqjXw2GyaG7ca5fmInrL3/JprV0xMS295x9zoe7CP1Tdo9ER2LpKBcSgTN3ODHjK8hIMwBsajmOcQjbC6EFmfiXUpT3gS91LMIN+AuCrcK/g3cRclDuMLhdwETtS72ptw==
[commit]
gpgsign = true
[core]
excludesfile = ~/.gitignore-global
editor = micro
pager = delta --dark
trustctime = false
[credential]
helper = osxkeychain
[delta]
syntax-theme = Visual Studio Dark+
[gpg]
format = ssh
[difftool "kdiff3"]
path = /usr/local/bin/kdiff3
[mergetool "kdiff3"]
path = /usr/local/bin/kdiff3
[merge]
renamelimit = 20000
conflictstyle = diff3
tool = kdiff3
[merge "npm-merge-driver"]
name = automatically merge npm lockfiles
driver = npm-merge-driver merge %A %O %B %P
[pull]
default = current
rebase = true
[push]
default = simple
[rebase]
autostash = true
[rerere]
enabled = true
# [url "[email protected]:"]
# insteadOf = https://github.com/
[alias]
aa = add -A
aam = !git add -A && git commit -v --amend
ac = !git add -A && git commit -m
acp = !git add -A && git commit -m \"$1\" && git push origin && echo >/dev/null
ap = add -p
az = !git add -A && git cz
bav = branch -av
bd = branch -D
brd = branch -rd
bu = branch -u
bv = branch -v
cam = commit -v --amend
cdf = clean -df
cdfx = clean -dfx
cfu = commit -v --fixup
ch = cherry-pick -x
ci = commit -m
cia = commit -am
cv = commit -v
cza = cz -a
co = checkout
cob = checkout -b
dci = duet-commit -m
dcv = duet-commit -v
drv = duet-revert
dmg = duet-merge
drb = rebase -i --exec 'git duet-commit --amend'
di = diff
ds = diff --staged
fe = fetch
fm = !git fetch origin master:master && git rebase origin/master
lg = log --graph --format='%cd %C(yellow)%h%C(red bold)%d%C(blue bold) [%an]%Creset %s' --date=short --abbrev=10
lga = log --graph --format='%cd %C(yellow)%h%C(red bold)%d%C(blue bold) [%an]%Creset %s' --date=short --abbrev=10 --all
lo = log
mm = !git fetch origin master:master && git merge origin/master
po = push origin
pu = pull origin
rba = rebase --abort
rbc = rebase --continue
rbi = rebase -i --autosquash
rbm = rebase master
rbs = rebase --skip
rmc = rm --cached
sa = stash apply
sd = !git stash show -p stash@{$1=0} && echo >/dev/null
si = submodule init
sl = stash list
sp = stash pop
sr = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git diff-index --quiet HEAD; s=$?; [ $s != 0 ] && git stash save \"tmp stash from stash-rename\"; git stash apply $rev && shift && git stash save \"$@\" && [ $s != 0 ] && git stash pop stash@{1}; }; _"
ss = stash save
ssk = stash save -k
ssu = stash save -u
ssku = stash save -ku
st = status
su = submodule update
sui = submodule update --init
sur = submodule update --remote
publish = !git push origin HEAD:refs/publish/$1
draft = !git push origin HEAD:refs/drafts/$1
pum = push origin HEAD:refs/publish/master
drm = push origin HEAD:refs/drafts/master
work = config user.email \"[email protected]\"
home = config user.email \"[email protected]\"