shell-stuff/gitconfig at master · v2k/shell-stuff · GitHub

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
[user]
    name = v2k
    email = vince@sketchpark.com
[color]
    ui = true
[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[color "status"]
    added = yellow
    changed = green
    untracked = cyan
[color "diff"]
    whitespace = red reverse
[core]
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
    editor = vim
# http://help.github.com/line-endings/
# - supposed to set this to true apparently...
#    autocrlf = true
    autocrlf = input

[branch]
    autosetuprebase = always

[alias]
    st = status
    stn = status -uno
    ci = commit
    br = branch
    co = checkout
    df = diff
    dc = diff --cached
    lg = log -p
    lol = log --graph --decorate --pretty=format:'%C(white)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
    lola = log --graph --decorate --pretty=format:'%C(white)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --all
    ls = ls-files
    incoming = !git fetch && git log ..origin/master
    # pull and push
    pp = !git pull --rebase && git push

    # stash, pull, pop
    spp = !git stash && git pull --rebase && git stash pop

    # Show files ignored by git:
    ign = ls-files -o -i --exclude-standard
	ctags = !.git/hooks/ctags
	sub = submodule foreach git

[push]
    default = tracking
[diff]
    tool = kdiff3
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    keepBackup = false
    trustExitCode = false
	path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
[fetch]
	recurseSubmodules = true
[init]
	templatedir = ~/.git_template