-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig.symlink
88 lines (88 loc) · 1.92 KB
/
gitconfig.symlink
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
; vim: set ft=gitconfig
[user]
name = Mikkel Malmberg
email = [email protected]
signingkey = 7B09867145A39CC3
[color]
diff = auto
status = auto
branch = auto
ui = true
[github]
user = mikker
[alias]
br = branch
cane = commit --amend --no-edit
ci = commit
cm = commit -m
co = checkout
hammer = commit --allow-empty -m 🔨
last = log -1 HEAD
pr = "!hub pull-request"
rb = rebase
st = status
sw = switch
tree = "log --graph --decorate --abbrev=commit"
undo = reset HEAD~1 --mixed
up = pull --rebase --autostash
upto = "branch --set-upstream-to"
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
[core]
excludesfile = ~/.gitignore
editor = nvim
pager = delta --theme='GitHub'
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
[push]
default = current
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[url "https://github.com"]
insteadOf = git:https://github.com
[stash]
showPatch = true
[rebase]
autostash = true
[log]
decorate = full
[pull]
ff = only
rebase = true
[credential]
helper = osxkeychain
[credential "https://github.com"]
username = mikker
[includeIf "gitdir:~/dev/elastic/"]
path = "~/.gitconfig-elastic"
[commit]
gpgsign = true
[merge]
tool = diffconflicts
[mergetool]
prompt = false
keepBackup = false
[difftool]
prompt = false
[diff]
tool = vimdiff
default = true
[mergetool "diffconflicts"]
cmd = nvim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[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
[interactive]
diffFilter = delta --color-only