aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
blob: e5dfcf065f8eeb06cc2bd0577b7dcc230b7b38bf (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
[user]
    name = Matt Singleton
    email = matt@xcolour.net

[alias]
    st = status
    ci = commit
    br = branch
    co = checkout
    df = diff
    lg = log -p

[core]
    whitespace = trailing-space,space-before-tab,cr-at-eol
    editor = vim
    autocrlf = input
    excludesfile = /Users/matt/.gitignore
    pager = less -+$LESS -RSX

[push]
    default = nothing

[color]
    ui = true

[mergetool]
    keepTemporaries = false
    prompt = false

[merge]
    tool = meld

[diff]
    tool = meld