-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
49 lines (45 loc) · 1.02 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
[alias]
[user]
name = Tomas Pustelnik
email = [email protected]
[core]
excludesfile = ~/.gitignore
autocrlf = input
ignorecase = false
pager = delta
[fetch]
prune = true
pruneTags = true
[help]
autocorrect = 1
[pull]
ff = only
[push]
followTags = true
[rebase]
autoSquash = true
updateRefs = true
[status]
showUntrackedFiles = all
[commit]
template = ~/.git-commit-template
#
# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
; cmd = nvim -d -f -c \"Gdiffsplit!\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
[mergetool]
promt = false
backup = false
[merge]
conflictStyle = diff3
tool = nvim
ff = false - always create merge comit even when fast-forwarded
# ff = only - allow only fast-forward merges
[github]
user = pustelto
[interactive]
diffFilter = delta --color-only
[delta]
true-color = always
navigate = true # use n and N to move between diff sections