-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
52 lines (51 loc) · 1.08 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
[user]
name = Christian Mösl
email = christian.moesl@gofore.com
# signingkey = 30C2947A
# 34C020723C521F4A!
# for university: signingkey = 71F860C6B8FA1C91\!
[core]
editor = nvim
[commit]
# gpgsign = true
[gpg]
program = gpg
[diff]
tool = vimdiff
[merge]
tool = fugitive
; conflictStyle = diff3
[difftool]
prompt = false
[mergetool]
prompt = false
; [mergetool "vimdiff"]
; path = nvim
; [difftool "vimdiff"]
; path = nvim
[difftool "vimdiff"]
cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[mergetool "vimdiff"]
cmd = vimdiff \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[mergetool "fugitive"]
cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[pull]
rebase = true
[push]
default = current
[rebase]
autosquash = true
updateRefs = true
[alias]
fixup = "!git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
[rerere]
enabled = true
[branch]
sort = -committerdate
[advice]
skippedCherryPicks = false