-
Notifications
You must be signed in to change notification settings - Fork 4
/
.gitconfig
100 lines (81 loc) · 2.11 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
[user]
name = Simon Hauser
email = [email protected]
[core]
editor = nvim
pager = delta
[alias]
aa = add --all
ap = add --patch
bv = branch -vv
ba = branch -ra
bd = branch -d
ca = commit --amend -v -S
cb = checkout -b
st = status --short --branch
ci = commit -v -S
co = checkout
di = diff
mm = merge --no-ff -S
br = branch
unstage = reset HEAD --
last = log -1 HEAD --show-signature
uncommit = reset --soft HEAD~1
pl = pull --autostash
sp = submodule foreach git pull origin master
rb = rebase -S
wip ="!git ci -m \"[WIP]: $(date)\""
fpr = "!f() { git fetch origin pull/$1/head:pr-$1; git checkout pr-$1; }; f"
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
ldate = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
ldatelong = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
# External commands
af = "!fgst af"
ah = "!fgst ah"
cf = "!fgst cf"
ch = "!fgst ch"
uf = "!fgst uf"
fcb = "!fcob"
fct = "!fcot"
fcc = "!fcoc"
alias = !git config --get-regexp '^alias\\.' | sed -e 's/^alias\\.//' -e 's/\\ /\\ =\\ /' | sort
[color]
ui = true
diff = auto
status = auto
branch = auto
[pull]
rebase = true
[diff]
tool = vimdiff3
[difftool "vimdiff3"]
path = nvim
[merge]
tool = vimdiff3
[mergetool "vimdiff3"]
path = nvim
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[delta]
line-numbers = true
side-by-side = true
file-modified-label = modified:
[interactive]
diffFilter = delta --color-only