-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
49 lines (49 loc) · 965 Bytes
/
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
[core]
editor = nvim
autocrlf = input
safecrlf = true
[push]
default = simple
gpgSign = if-asked
[diff]
tool = meld
algorithm = histogram
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[mergetool]
keepBackup = false
[merge]
conflictstyle = diff3
tool = meld
ff = only
[mergetool]
keepBackup = false
[mergetool "meld"]
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[alias]
cleanup = !git branch --merged master | grep -v master | xargs -n 1 git branch -d
ignore = !git update-index --assume-unchanged
deignore = !git update-index --no-assume-unchanged
ignored = !git ls-files -v | grep "^[[:lower:]]"
wat = log --graph --decorate --oneline -15
[user]
name = Paweł Jan Czochański
signingkey = 20810F57B5910162
[gpg]
program = gpg2
[color]
ui = true
[transfer]
fsckObjects = true
[receive]
fsckObjects = false
[fetch]
fsckObjects = false
ui = true
parallel = 0
[commit]
gpgsign = true
[tag]
gpgsign = true
[pull]
ff = only