config_files/.gitconfig at master · bazko1/config_files · GitHub

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
[core]
	editor = nvim
[alias]
	a = add
	ap = add -p
	b = branch
	c = commit
	ch = checkout
	d = diff
	ds = diff --staged
	l = log
	p = push
	s = status
	br = branch --show-current
	pl = pull
	st = status -uno
	curr = branch --show-current
	lc = "!fn() { \
		git log -\"$1\" --oneline \
		--cherry-mark --left-right \
		\"$2\"; \
		}; fn"
[diff]
	tool = nvimdiff
[branch]
	sort = committerdate
[column]
	ui = auto
[user]
	name = bazko1

# delta config
[core]
    pager = delta
[interactive]
    diffFilter = delta --color-only

[delta]
    navigate = true  # use n and N to move between diff sections
    dark = true      # or light = true, or omit for auto-detection
    side-by-side = true
[merge]
    conflictStyle = zdiff3

# vi: ft=gitconfig