summaryrefslogtreecommitdiff
path: root/.gitconfig
blob: 8d6054fa147fb23412ff98ade569b1be0133392f (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
# -*- 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

[core]
        # no pager thanks
	pager = 
	excludesfile = ~/.globgitignore

# my personal repositories cloned via HTTP must be pushed via SSH
[url "ssh://ma/~/local/git/"]
     pushInsteadOf = http://spw.sdf.org/git/
# github pulling and pushing should be correct however I refer to the
# repo when cloning
[url "git@github.com:"]
    pushInsteadOf = https://github.com/
    pushInsteadOf = git://github.com/
    pushInsteadOf = github:
[url "git://github.com/"]
    insteadOf = github:

# 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