-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
110 lines (85 loc) · 1.85 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
[github]
user = jweslley
[user]
name = Jonhnny Weslley
email = jw@jonhnnyweslley.net
[url "git@github.com:jweslley/"]
insteadOf = gh:
[url "git@gitlab.com:jweslley/"]
insteadOf = gl:
[url "git@github.com:"]
pushInsteadOf = https://github.com/
pushInsteadOf = git://github.com/
[core]
trustctime = false
excludesfile = ~/.gitignore
;editor = vim.basic -c startinsert
;[init]
;templatedir = ~/.git_template
[branch]
autosetupmerge = true
autosetuprebase = local
[push]
default = upstream
[merge]
tool = vimdiff
conflictstyle = diff3
prompt = false
[mergetool]
keepBackup = false
[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
[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]
b = branch
h = help
co = checkout
ls = ls-files
# git add
a = number add
aa = add --all
ap = add --patch
ad = !git rm $(git ls-files --deleted)
ac = !git add $(git ls-files --modified)
au = !git add $(git ls-files --others --exclude-standard) # add unstaged/untracked files
# commits
ci = commit -m
ca = commit --all -m
amend = commit --amend
# diff
d = diff
p = diff --cached # patch
di = diff --word-diff # diff inline
# 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'
so = number checkout
# topic branches
t = checkout -b
m = merge --no-ff
# misc
vi = number -vi