-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
97 lines (80 loc) · 1.9 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
[user]
name = Tomasz Szczęśniak-Szlagowski
email = [email protected]
[core]
ignorecase = false
excludesfile = ~/.gitignore_global
[alias]
co = checkout
ci = commit
cim = commit --amend
ca = commit -a
cam = commit -a --amend
cp = cherry-pick
df = diff
dfc = diff --cached
dt = difftool
st = status
lp = log -p
bl = blame
aa = add -A
sh = show
l = log --pretty=oneline
pl = pull
plup = pull upstream master
ours = checkout --ours
rim = rebase -i master
theirs = checkout --theirs
lgraph = log --graph --pretty=oneline --abbrev-commit
cob = checkout -b
ff = pull --ff-only
merged = !git branch --merged | grep -v '\\*'
sup = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
fetchforce = !git fetch origin `git symbolic-ref --short HEAD` && git reset --hard origin/`git symbolic-ref --short HEAD`
past6months = log --author Tomasz master --oneline --since '6 months ago'
past3weeks = log --author Tomasz master --since '3 weeks ago'
[diff]
tool = vimdiff
noprefix = true
[difftool]
prompt = false
[color]
ui = auto
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[merge]
tool = nvim
conflictstyle = diff3
[mergetool]
prompt = false
keepBackup = false
[init]
defaultBranch = master
[pager]
diff = delta
log = delta
reflog = delta
show = delta
[interactive]
diffFilter = delta --light --color-only --features=interactive
[delta]
features = decorations
light = true
side-by-side = true
[delta "interactive"]
keep-plus-minus-markers = false
[delta "decorations"]
commit-decoration-style = blue
commit-style = raw
file-style = raw
hunk-header-style = omit
[diff "hex"]
textconv = hexdump -v -C
binary = true
[push]
default = current
autoSetupRemote = true