Commit | Line | Data |
---|---|---|
ca3a844a AB |
1 | [user] |
2 | name = Amin Bandali | |
b5dea933 AB |
3 | email = bandali@gnu.org |
4 | signingKey = BE6273738E616D6D1B3A08E8A21A020248816103 | |
5 | ||
6 | [commit] | |
7 | gpgSign = true | |
ca3a844a AB |
8 | |
9 | # [format] | |
10 | # signoff = true | |
11 | ||
12 | [core] | |
13 | autocrlf = input # CRLF -> LF on commit | |
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 | |
81e04d6f | 26 | l = log |
ca3a844a AB |
27 | c = checkout |
28 | cb = checkout -b | |
29 | b = branch | |
e5b52a9a | 30 | f = fetch |
ca3a844a AB |
31 | r = rebase |
32 | p = pull | |
33 | pr = pull --rebase | |
34 | ps = push | |
35 | psf = push --force | |
36 | nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f" | |
37 | nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f" | |
b5dea933 AB |
38 | gnu = config user.email 'bandali@gnu.org' |
39 | kelar = config user.email 'bandali@kelar.org' | |
40 | sfl = config user.email 'amin.bandali@savoirfairelinux.com' | |
41 | canonical = config user.email 'amin.bandali@canonical.com' | |
ca3a844a AB |
42 | |
43 | [color] | |
44 | ui = auto | |
45 | [color "status"] | |
46 | added = green bold | |
47 | changed = red bold | |
48 | untracked = red bold | |
49 | [color "branch"] | |
50 | current = green bold | |
51 | remote = magenta bold | |
52 | [color "diff"] | |
53 | new = green bold | |
54 | old = red bold | |
55 | ||
56 | # [status] | |
57 | # # showUntrackedFiles = all | |
58 | # short=true | |
59 | # branch=true | |
60 | ||
61 | [github] | |
b5dea933 | 62 | user = bandali0 |
ca3a844a AB |
63 | |
64 | [sendemail] | |
65 | smtpuser = bandali | |
b5dea933 | 66 | smtpserver = fencepost.gnu.org |
ca3a844a AB |
67 | smtpserverport = 587 |
68 | smtpencryption = tls | |
69 | annotate = yes | |
70 | ||
71 | [transfer] | |
72 | fsckObjects = true | |
f53becdc | 73 | |
b9347cae | 74 | [init] |
093efbaf | 75 | defaultBranch = main |
ccbb7191 AB |
76 | |
77 | [url "bandali@git.launchpad.net:"] | |
78 | insteadof = lp: | |
79 | [url "git@salsa.debian.org:gnome-team/"] | |
80 | insteadof = pkg-gnome: | |
81 | [url "git@salsa.debian.org:bandali/"] | |
82 | insteadof = salsa-bandali: | |
83 | [merge "dpkg-mergechangelogs"] | |
84 | name = debian/changelog merge driver | |
85 | driver = dpkg-mergechangelogs -m %O %A %B %A | |
86 | ||
87 | [includeIf "gitdir:~/s/canonical/"] | |
88 | path = ~/.config/git/config.canonical | |
89 | [includeIf "gitdir:~/s/sfl/"] | |
90 | path = ~/.config/git/config.sfl |