summaryrefslogtreecommitdiff
path: root/git/.gitconfig
blob: 77d7c22288c967f8f30eebfd85fb2400bd4537f5 (plain) (blame)
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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
[alias]
	co = checkout
	ci = commit
	st = status
	br = branch
	hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
	type = cat-file -t
	dump = cat-file -p

[http]
	sslVerify = false

[column]
	ui = auto

[commit]
	gpgsign = true
	verbose = true

[branch]
	autosetuprebase = always
	sort = -committerdate

[tag]
		sort = version:refname

[help]
	autocorrect = 1

[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f

[remote "origin"]
	fetch = +refs/pull/*/head:refs/remotes/origin/pull/*

[receive]
	fsckObjects = true

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

[rebase]
	autoStash = true
	autoSquash = true
	updateRefs = true

[pull]
	rebase = true
	recurseSubmodules = on-demand

[fetch]
	prune = true
	pruneTags = true
	all = true
	output = full

[push]
	default = simple
	autoSetupRemote = true
	followTags = true

[merge]
	conflictstyle = zdiff3

[core]
	preloadindex = true
	excludesFile = ~/.gitignore
	trustctime = false
	commitGraph = true

[diff]
	indentHeuristic = true
	algorithm = histogram
	tool = vimdiff

[log]
	date = local

[rerere]
	enabled = true
	autoupdate = true

[pager]
	color = true

[status]
	color = true
	submodulesummary = true

[init]
	defaultBranch = master

#[pager]
#	diff = delta
#	log = delta
#	reflog = delta
#	show = delta

#[interactive]
#	diffFilter = delta --color-only --features=interactive

#[delta]
#	features = decorations

#[delta "interactive"]
#	keep-plus-minus-markers = false

#[delta "decorations"]
#	commit-decoration-style = blue ol
#	commit-style = raw
#	file-style = omit
#	hunk-header-decoration-style = blue box
#	hunk-header-file-style = red
#	hunk-header-line-number-style = "#067a00"
#	hunk-header-style = file line-number syntax

[include]
	path = .gitconfig.local

[gpg]
	format = ssh

[color]
	ui = auto

[color "diff"]
	meta = yellow bold
	commit = green bold
	frag = magenta bold
	old = red bold
	new = green bold
	whitespace = red reverse

[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "status"]
	added = yellow
	changed = green
	untracked = cyan