* .emacs.d/lisp/bandali-erc.el: Small tweaks/fixes.
[~bandali/configs] / .config / git / config
CommitLineData
ca3a844a
AB
1[user]
2 name = Amin Bandali
b5dea933
AB
3 email = bandali@gnu.org
4 signingKey = BE6273738E616D6D1B3A08E8A21A020248816103
5
1512d34e 6[tag]
b5dea933 7 gpgSign = true
ca3a844a
AB
8
9# [format]
10# signoff = true
11
12[core]
e5010376 13# autocrlf = input # CRLF -> LF on commit
ca3a844a
AB
14 editor = emacsclient -t
15 pager = "less"
16
17[mailmap]
18 file = ~/.config/git/mailmap
19
20[alias]
21 git = !exec git # handle nested git calls, e.g. git git status
22 aliases = config --get-regexp '^alias\\.'
23 a = add
24 s = status
25 sl = status --long
1512d34e 26 l = log
ca3a844a
AB
27 c = checkout
28 cb = checkout -b
29 b = branch
1512d34e 30 d = diff
e5b52a9a 31 f = fetch
ca3a844a
AB
32 r = rebase
33 p = pull
34 pr = pull --rebase
35 ps = push
36 psf = push --force
37 nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
38 nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
b5dea933
AB
39 gnu = config user.email 'bandali@gnu.org'
40 kelar = config user.email 'bandali@kelar.org'
41 sfl = config user.email 'amin.bandali@savoirfairelinux.com'
42 canonical = config user.email 'amin.bandali@canonical.com'
ca3a844a
AB
43
44[color]
45 ui = auto
46[color "status"]
47 added = green bold
48 changed = red bold
49 untracked = red bold
50[color "branch"]
51 current = green bold
52 remote = magenta bold
53[color "diff"]
54 new = green bold
55 old = red bold
56
57# [status]
58# # showUntrackedFiles = all
59# short=true
60# branch=true
61
62[github]
b5dea933 63 user = bandali0
ca3a844a
AB
64
65[sendemail]
66 smtpuser = bandali
b5dea933 67 smtpserver = fencepost.gnu.org
ca3a844a
AB
68 smtpserverport = 587
69 smtpencryption = tls
70 annotate = yes
71
72[transfer]
73 fsckObjects = true
f53becdc 74
b9347cae 75[init]
093efbaf 76 defaultBranch = main
ccbb7191
AB
77
78[url "bandali@git.launchpad.net:"]
79 insteadof = lp:
9b89e819
AB
80[url "git@salsa.debian.org:"]
81 insteadof = salsa:
ccbb7191
AB
82[url "git@salsa.debian.org:gnome-team/"]
83 insteadof = pkg-gnome:
84[url "git@salsa.debian.org:bandali/"]
85 insteadof = salsa-bandali:
9b89e819
AB
86[url "git@github.com:"]
87 insteadof = gh:
ccbb7191
AB
88[merge "dpkg-mergechangelogs"]
89 name = debian/changelog merge driver
90 driver = dpkg-mergechangelogs -m %O %A %B %A
91
92[includeIf "gitdir:~/s/canonical/"]
93 path = ~/.config/git/config.canonical
94[includeIf "gitdir:~/s/sfl/"]
95 path = ~/.config/git/config.sfl