dotfiles/.gitconfig at master · timseriakov/dotfiles · 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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
[user]
	name = Tim.Seriakov
	email = t.seriakov@gmail.com

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

[init]
	defaultBranch = master

[core]
	pager = delta
    autocrlf = input
	hooksPath = /Users/tim/.codex/git-hooks

[interactive]
	diffFilter = delta --color-only

[delta]
  theme = Nord
	side-by-side = true
  line-numbers = true
	navigate = true
  syntax-theme = Nord
  light = false
  zero-style = syntax
  keep-plus-minus-markers = true
  hyperlinks = false

[merge]
	conflictstyle = diff3
	tool = nvimdiff

[diff]
	colorMoved = default
	tool = nvimdiff            # use Neovim for `git difftool` (Ctrl+T in LazyGit)

[difftool]
	prompt = false

[difftool "nvimdiff"]
	cmd = nvim -d "$LOCAL" "$REMOTE"

[pager]
	diff =                     # disable pager for `git diff` so difftastic prints directly

[difftool "nvimdiff"]
	# Separate minimal profile
	cmd = env NVIM_APPNAME=nvim-diff nvim -d "$LOCAL" "$REMOTE"

[mergetool]
	prompt = false
	keepBackup = false

[mergetool "nvimdiff"]
	# 4-pane merge: LOCAL | BASE | REMOTE with MERGED at bottom
	cmd = env NVIM_APPNAME=nvim-diff nvim -d "$LOCAL" "$BASE" "$REMOTE" "$MERGED" -c 'wincmd J' -c 'wincmd ='

[alias]
  sdiff = !sh -c 'git diff --no-ext-diff --color=always "$@" | git-split-diffs --color=16m | less -RFX' -
  slog  = !sh -c 'git log -p --color=always "$@" | git-split-diffs --color=16m | less -RFX' -
  vdiff = !sh -c 'git diff --no-ext-diff --color=always "$@" | diff-so-fancy | less -RFX' -
  vlog  = !sh -c 'git log -p --color=always "$@" | diff-so-fancy | less -RFX' -
	difi = !difi
  deff = !deff

[split-diffs]
    # Allow split view on narrower panes (e.g. LazyGit panel widths)
    	min-line-width = 0
    # Point to custom theme directory in this repo
	theme-directory = /Users/tim/dev/dotfiles/git-split-diffs
    # Use the Nord-based theme without background colors
    	theme-name = arctic-nobg
    	syntax-highlighting-theme = nord
[coderabbit]
	machineId = cli/a396e9c8c0df4af8be1396a8094f56fc