summaryrefslogtreecommitdiffstats
path: root/.config/git/config
blob: fa7584ef5e838bdf65fdad927a55f643e8d762ce (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
[user]
	name = Amin Bandali
	email = bandali@gnu.org
	signingKey = BE6273738E616D6D1B3A08E8A21A020248816103

[tag]
	gpgSign = true

# [format]
# 	signoff = true

[core]
	autocrlf = input  # CRLF -> LF on commit
	editor = emacsclient -t
	pager = "less"

[mailmap]
	file = ~/.config/git/mailmap

[alias]
	git = !exec git	 # handle nested git calls, e.g. git git status
	aliases = config --get-regexp '^alias\\.'
	a = add
	s = status
	sl = status --long
	l = log
	c = checkout
	cb = checkout -b
	b = branch
	d = diff
	f = fetch
	r = rebase
	p = pull
	pr = pull --rebase
	ps = push
	psf = push --force
	nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
	nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
	gnu = config user.email 'bandali@gnu.org'
	kelar = config user.email 'bandali@kelar.org'
	sfl = config user.email 'amin.bandali@savoirfairelinux.com'
	canonical = config user.email 'amin.bandali@canonical.com'

[color]
	ui = auto
[color "status"]
	added = green bold
	changed = red bold
	untracked = red bold
[color "branch"]
	current = green bold
	remote = magenta bold
[color "diff"]
	new = green bold
	old = red bold

# [status]
# 	# showUntrackedFiles = all
# 	short=true
# 	branch=true

[github]
	user = bandali0

[sendemail]
	smtpuser = bandali
	smtpserver = fencepost.gnu.org
	smtpserverport = 587
	smtpencryption = tls
	annotate = yes

[transfer]
	fsckObjects = true

[init]
	defaultBranch = main

[url "bandali@git.launchpad.net:"]
	insteadof = lp:
[url "git@salsa.debian.org:gnome-team/"]
	insteadof = pkg-gnome:
[url "git@salsa.debian.org:bandali/"]
	insteadof = salsa-bandali:
[merge "dpkg-mergechangelogs"]
	name = debian/changelog merge driver
	driver = dpkg-mergechangelogs -m %O %A %B %A

[includeIf "gitdir:~/s/canonical/"]
	path = ~/.config/git/config.canonical
[includeIf "gitdir:~/s/sfl/"]
	path = ~/.config/git/config.sfl