aboutsummaryrefslogtreecommitdiff
path: root/config/git/config.linux
blob: 66cd0ddaae129b673e0c9be5cbd12d144271bdd9 (plain)
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
# vim:ft=gitconfig

[user]
	name = Charles Cabergs
    email = me@cacharle.xyz
	; signingkey = me@cacharle.xyz
	signingkey = ~/.ssh/id_ed25519.pub
[log]
	decorate = full
[pull]
	rebase = false
[merge]
	tool = vimdiff
    conflictstyle = diff3
	ff = true
[mergetool]
    keepBackup = false
    prompt = false
[mergetool "vimdiff"]
    cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='"
[commit]
	gpgsign = true
[gpg]
    format = ssh
[init]
	defaultBranch = master
[difftool "bat"]
    cmd = "/usr/bin/bat --diff $REMOTE"
[difftool]
    prompt = false
[diff]
    colorMoved = default
[core]
    editor = "VIMINIT='' nvim"
    pager = delta
[interactive]
    diffFilter = delta --color-only --syntax-theme gruvbox-dark
[delta]
    syntax-theme = gruvbox-dark
    # side-by-side = true
    navigate = true    # use n and N to move between diff sections
    line-numbers = true
[safe]
    directory = *
[push]
	autoSetupRemote = true  # git push without remote and branch specified
[tag]
	sort = v:refname  # Sort tag by version instead of ascii sort

[filter "lfs"]
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process