dotfiles/.gitconfig at main · solid174/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
80
81
82
83
84
85
86
87
88
[core]
	ignorecase = false
	pager = delta
	autocrlf = input

[user]
	name = No Name
	email = none@local.invalid

[format]
	pretty = "%C(yellow)%h %C(dim green)%cd %C(reset)| %C(#ff8c1a)%d %C(cyan)%s %C(#667788)[%an]"
[log]
	date = format-local:'%F %H:%M'
	decorate = short
	abbrevCommit = true
	showSignature = false

[pull]
	rebase = true

[push]
	autoSetupRemote = true

[init]
	defaultBranch = main

# rebase-heavy workflow: remember resolved conflicts and replay them automatically
# when the same branch gets rebased again
[rerere]
	enabled = true
	autoupdate = true

[fetch]
	prune = true          # drop local refs for branches deleted on the remote
	pruneTags = true

[interactive]
	diffFilter = delta --color-only

[delta]
	navigate = true
	line-numbers = true
	syntax-theme = Catppuccin Mocha
	# side-by-side lives in a feature so lazygit can opt out (--features=lazygit)
	features = wide-view

[delta "wide-view"]
	side-by-side = true

[merge]
	conflictStyle = zdiff3

[diff]
	colorMoved = default
	algorithm = histogram   # markedly saner than the default myers on refactors

# freshest branches first, tags by version, multi-column output across terminal width
[branch]
	sort = -committerdate
[tag]
	sort = -version:refname
[column]
	ui = auto

[alias]
	st = status -sb
	co = checkout
	sw = switch
	br = branch
	cm = commit
	amend = commit --amend --no-edit
	lg = log --graph --decorate --oneline --all

# Windows
[includeIf "gitdir/i:D:/src/hobby/"]
	path = D:/src/hobby/.gitconfig
[includeIf "gitdir/i:D:/src/work/"]
	path = D:/src/work/.gitconfig

# macOS / Linux
[includeIf "gitdir:~/coding/src/hobby/"]
	path = ~/coding/src/hobby/.gitconfig
[includeIf "gitdir:~/coding/src/work/"]
	path = ~/coding/src/work/.gitconfig

# narrow panes in lazygit: feature overrides side-by-side from [delta]
[delta "lazygit"]
	side-by-side = false