-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
132 lines (98 loc) · 2.2 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
[user]
name = Jonhnny Weslley
email = [email protected]
signingkey = /Users/jweslley/.ssh/id_rsa.pub
[url "[email protected]:jweslley/"]
insteadOf = gh:
[url "[email protected]:jweslley/"]
insteadOf = gl:
[url "[email protected]:"]
pushInsteadOf = https://github.com/
pushInsteadOf = git://github.com/
[url "https://github.com/"]
insteadOf = git://github.com/
[core]
trustctime = false
excludesfile = ~/.gitignore
;editor = vim.basic -c startinsert
;[init]
;templatedir = ~/.git_template
[branch]
autosetupmerge = true
autosetuprebase = local
sort = -committerdate
[commit]
gpgsign = true
[push]
default = current
autoSetupRemote = true
[pull]
rebase = true
[merge]
tool = nvim
conflictstyle = zdiff3
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[diff]
tool = difftastic
external = difft
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[rebase]
autosquash = true
[rerere]
enabled = 1
[help]
autocorrect = 1
[clean]
requireForce = true
[format]
;pretty = %C(yellow)%h%Creset -%C(bold red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset
[gpg]
format = ssh
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[color]
ui = auto
[color "diff"]
plain = white dim
meta = normal dim
frag = blue bold
old = red
new = green
whitespace = red reverse
[color "status"]
header = normal dim
added = green
changed = yellow
untracked = cyan
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[alias]
co = checkout
# git add
a = number add
aa = add --all
ap = add --patch
# commits
amend = commit --amend
# diff
d = diff
p = diff --cached # patch
di = diff --word-diff # diff inline
dd = diff --no-ext-diff # default diff
# status and history
s = number
rmu = number -"rm -rf"
l = log --graph --format='%C(yellow)%h%Creset -%C(bold red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
cc = !git log --format='format:' --name-only | egrep -v '^$' | sort | uniq -c | sort -rg | head -10
so = number checkout
# misc
vi = number -nvim