aboutsummaryrefslogtreecommitdiffstats
path: root/git/config
blob: b9be8fec69f5984d02a15039c49969b8bcb7f3bc (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
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
[user]
	name = Johannes Löthberg
	email = johannes@kyriasis.com
	signingkey = 3A9D0BB5

[alias]
	amend = commit --amend --verbose
	br = branch
	ci = commit --verbose
	co = checkout
	di = diff
	dc = diff --cached
	empty = !git init && git commit --allow-empty -m \"Initial commit\"
	follow = log --oneline --follow --stat --summary --
	last = log -1 HEAD
	lg = log --oneline --decorate
	mend = commit --amend --reuse-message HEAD
	mrproper = !git reset --hard HEAD && git clean -fdx
	ours = !git checkout --ours $@
	out = log --oneline --decorate @{upstream}..
	rbc = rebase --continue
	rbs = rebase -i
	re = rebase
	st = status
	stat = diff --stat
	statc = diff --cached --stat
	tagv = !git tag -v $(git describe --abbrev=0)
	theirs = !git checkout --theirs $@
	tip = !git --no-pager log -1 --decorate --abbrev-commit --date=relative --show-signature
	undo = reset --soft HEAD^
	unstage = reset HEAD --
	up = remote update
	wdiff = diff --word-diff
	wshow = show --word-diff
	fpush = push --force-with-lease
	shortdesc = !git --no-pager log -1 --pretty='tformat:%h (%s, %ad)' --date=short

[advice]
	detachedHead = false

[am]
	messageid = true

[branch]
	autosetuprebase = always

[color]
	ui = true
	branch = true
	diff = true
	status = true

[column]
	branch = never
	status = never
	tag = auto dense

[core]
	# never use an askpass even if $SSH_ASKPASS is set
	askpass =
	logAllRefUpdates = true
	pager = less -x1,5

[diff]
	renames = copies

[diff "gpg"]
	textconv = gpg -v
	xfuncname = "^((pub|uid) .*)"

[diff "ldif"]
	xfuncname = "^(dn: .+)$"

[gc]
	reflogExpire = 365 days
	reflogExpireUnreachable = 365 days

[github]
	user = kyrias
	password = !pass show web/github.com | head -1

[grep]
	lineNumber = true
	extendedRegexp = true

[log]
	decorate = full

[merge]
	tool = vimdiff
	conflictStyle = diff3

[push]
	default = current

[repack]
	writebitmaps = true
	autosquash = true

[receive]
	denyCurrentBranch = updateInstead

[sendemail]
	aliasfiletype = mutt
	aliasesfile = /home/kyrias/.config/git/aliases
	envelopesender = johannes@kyriasis.com
	smtpserver = /usr/bin/msmtp
	smtpserveroption = "-C"
	smtpserveroption = "/home/kyrias/.config/msmtprc"
	supresscc = self

[status]
	showuntrackedfiles = no

[url "git@github.com:"]
	pushInsteadOf = git://github.com/
	pushInsteadOf = https://github.com/

[url "git@git.kyriasis.com"]
	insteadOf = kyriasis:

[credential "https://github.com"]
	username = kyrias
	helper = pass
[rerere]
	enabled = true