mygitconfig/.gitconfig at master · simonpercivall/mygitconfig · 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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
[core]
    excludesfile = "~/.gitignore"
    editor = vim
    autcrlf = input
    whitespace = cr-at-eol

[user]
    name = Simon Percivall
    # specified by GIT_COMMITTER_EMAIL
    # email =

[alias]
    # basic shortcuts
    b = branch -avv
    t = tag
    d = diff
    ds = diff --staged
    ci = commit -v
    co = checkout
    stat = status
    st   = status
    unstage = reset HEAD --

    # log commands
    wc = whatchanged --abbrev-commit --date=relative --date-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' -n 45
    logp = "!f() { LESS='-FRX' GIT_PAGER='less -n +/^commit: ' git log --patch-with-stat $@; }; f"
    logs = "!f() { LESS='-FRX' GIT_PAGER='less -n +/^commit: ' git log --stat --no-merges $@; }; f"
    glog = log --graph --all --branches --date-order
    oneline = log --date-order --pretty='format:%Cgreen%h %Cblue%ai %Creset-- %s'

    # search
    search = "!f() { A1=$1; shift; git logp -S\"$A1\" $@; }; f"

    # meld
    meld = difftool -t meld

    # git svn
    spull = svn rebase
    spush = svn dcommit

[format]
    pretty=%C(yellow)commit: %h%Cblue%d%Creset%nAuthor: %an%nDate:   %ad%n%n%w(0,4,4)%s%n%b

[merge]
    keepBackup = false;
    tool = p4merge

[mergetool]
    prompt = false

[mergetool "p4merge"]
    trustExitCode = false

[diff]
    renames = true
    tool = p4merge

[color]
    ui = true
    branch = auto
    diff = auto
    status = auto

[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green

[color "diff"]
    meta = blue
    frag = magenta
    old = red
    new = green

[color "status"]
    added = green
    changed = magenta
    untracked = reverse

[apply]
    whitespace = nowarn

[pack]
    threads = 0

[blame]
    date = relative

[tig]
    show-rev-graph = yes
    show-refs = yes
    line-graphics = yes

[tig "bind"]
    generic = G !echo
    stage = G !echo
    main = G !echo

[tig "color"]
    author = green default normal

[diff "exif"]
    textconv = exiftool

[diff "word"]
    textconv = strings

[push]
    default = tracking