-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
138 lines (124 loc) · 3.54 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
[user]
name = "hqkhan"
email = "[email protected]"
[color]
ui = auto
[core]
; pager = less -FMRiX
pager = delta
editor = nvim
whitespace = cr-at-eol
; git prints non-ASCII file names in quoted octal notation,
; i.e. "\nnn\nnn...", disable to display UTF-8 chars
quotepath = off
[pull]
rebase = true
;default pull is fast-forward only
;use `git pr` to pull --rebase
; ff = only
[apply]
whitespace = warn
[help]
; do not automatically run autocorrect commands
autocorrect = 0
[push]
default = simple
[commit]
verbose = true
; [diff]
; tool = vimdiff
; renames = copy
; [difftool "vimdiff"]
; cmd = nvim -d $LOCAL $REMOTE
; [merge]
; tool = vimdiff
;conflictStyle = diff3
; [mergetool "vimdiff"]
; cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[color]
diff = auto
status = auto
branch = auto
ui = true
[alias]
; lg = log --pretty=format:'%C(yellow)%h%Creset %Cgreen(%><(12)%cr%><|(12))%Creset %s %C(blue)<%an>%Creset'
a = add
ai = add --interactive
ap = add --patch
b = branch
br = branch
ba = branch --all
bd = branch --delete
c = commit
cm = commit -m
cam = commit -am
ca = commit --amend
fx = commit --fixup
co = checkout
cb = checkout -b
cp = cherry-pick
d = diff
ds = diff --stat
dc = diff --cached
dcs = diff --cached --stat
f = fetch
fo = fetch origin
l = log --pretty=oneline
lp = log --patch
ls = log --stat
m = merge
ma = merge --abort
mt = mergetool
pl = pull --ff-only
ps = push
psf = push --force
pr = pull --rebase=true
rc = rebase --continue
rs = rebase --skip
ra = rebase --abort
ri = rebase --interactive
rr = rebase --interactive --root
ria = rebase --interactive --autosquash
rv = remote --verbose
s = status
st = status -sbu
sb = status -sb
sta = stash
sa = stash apply
sl = stash list
sp = stash pop
ss = stash show
;undo-commit undo last commit, preserve local changes
;undo-staging unstage all changes, preserve local changes
;reset-hard discard all changes since last commit
;reset-origin reset repository to remote origin
;reset-pull discard local changes & pull from origin
undo-commit = reset --mixed HEAD^1
undo-staging = reset --mixed HEAD
reset-hard = reset --hard HEAD
reset-origin = reset --hard origin/master
reset-pull = "!f(){ git reset --hard HEAD && git pull --rebase; }; f"
squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} -m \"${1:-A new start}\");};f"
[delta]
dark = true
; file-style = "#d4bfff" bold "#100E23"
file-style = "#f85552" bold "#081633"
hunk-header-style = omit
line-numbers = true
line-numbers-left-format = "{nm:>3}┊"
line-numbers-left-style = "#ff5370"
line-numbers-minus-style = "#ff5370" italic "#585273"
line-numbers-plus-style = "#A1EFD3" italic "#585273"
; line-numbers-minus-style = "#ff5370" italic "#100E23"
; line-numbers-plus-style = "#A1EFD3" italic "#100E23"
line-numbers-right-format = "{np:>3}┊"
line-numbers-right-style = "#A1EFD3"
line-numbers-zero-style = "#999999" italic
minus-emph-style = "#ff5370" bold "#585273"
; minus-emph-style = "#ff5370" bold "#100E23"
minus-style = "#ff5370"
plus-emph-style = "#A1EFD3" bold "#585273"
; plus-emph-style = "#A1EFD3" bold "#100E23"
plus-style = "#A1EFD3"
whitespace-error-style = "#280050" reverse
zero-style = "#656A7c"