blob: 39f0733fa0429b250f8ac19dafea78b126800784 (
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
|
# -*- mode: conf; -*-
[user]
name = Sean Whitton
email = spwhitton@spwhitton.name
[alias]
# Convenient sync alias from
# http://stackoverflow.com/a/17722977. Updates master while
# allowing only fast-forward merges and does not require
# checking out master; can remain on current branch
sync = "!git checkout --quiet HEAD; git fetch origin master:master; git checkout --quiet -"
# nice way to view history (most recent 30 commits). ov
# ('overview') collapses linear commits with addition of
# --simplify-by-decoration
v = log --graph --full-history -n 30 --decorate --oneline --branches --all
ov = log --graph --full-history -n 30 --decorate --oneline --branches --all --simplify-by-decoration
co = checkout
# "git exec blah" runs blah from the root of the worktree since shell
# alias are always run from the root of the worktree
# http://stackoverflow.com/questions/957928/is-there-a-way-to-get-the-git-root-directory-in-one-command#comment9747528_957978
exec = "!exec "
[core]
# no pager thanks
pager =
excludesfile = ~/.globgitignore
[url "git@spwhitton.name:"]
pushInsteadOf = https://git.spwhitton.name/
pushInsteadOf = athena:
# private repositories must clone by SSH
insteadOf = athenap:
[url "https://git.spwhitton.name/"]
insteadOf = git://spwhitton.name/
insteadOf = athena:
[url "swhitton@athena.silentflame.com:"]
insteadOf = athenah:
[url "git@github.com:"]
pushInsteadOf = https://github.com/
pushInsteadOf = http://github.com/
pushInsteadOf = git://github.com/
pushInsteadOf = github:
[url "https://github.com/"]
insteadOf = https://github.com/
insteadOf = http://github.com/
insteadOf = git://github.com/
insteadOf = github:
[url "https://anonscm.debian.org/git/"]
insteadOf = alioth:
[url "spw-guest@git.debian.org:/git/"]
pushInsteadOf = alioth:
# temporary redirects
[url "git@spwhitton.name:dotfiles.git"]
insteadOf = https://github.com/spwhitton/dotfiles.git
pushInsteadOf = https://github.com/spwhitton/dotfiles.git
# [url "git@spwhitton.name:propellor.git"]
# insteadOf = https://github.com/spwhitton/propellor.git
# turn colour on in as many places as possible
[color]
ui = true
branch = auto
diff = auto
interactive = auto
status = auto
# push strategy
[push]
default = current
followTags = true
# how to use git-send-email:
# <http://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/>
# &
# <https://burzalodowa.wordpress.com/2013/10/05/how-to-send-patches-with-git-send-email/>
[sendemail]
aliasesfile = ~/doc/mutt-aliases
aliasfiletype = mutt
confirm = always
multiedit = false
from = Sean Whitton <spwhitton@spwhitton.name>
annotate = true
[merge "dpkg-mergechangelogs"]
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A
|
