forked from mathiasbynens/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
87 lines (85 loc) · 2.28 KB
/
.gitconfig
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
[alias]
a = !git add . && git status
au = !git add -u . && git status
aa = !git add . && git add -u . && git status
d = diff --color-words
dh = diff head
ds = diff stat
s = status
st = status
ci = commit
co = checkout
br = branch
bi = bisect
cim = commit -m
cia = commit -am
f = flow
ffs = flow feature start
fff = flow feature finish
this = !git init && git add . && git commit -m \"initial commit\"
amend = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
r = !git ls-files -z --deleted | xargs -0 git rm
alias = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\t=> \\2/' | sort
ignore=!([ ! -e .gitignore ] && touch .gitignore) | echo $1 >>.gitignore
master = checkout master
develop = checkout develop
[apply]
whitespace = fix
[core]
excludesfile = /Users/tomdavies/.gitignore
attributesfile = ~/.gitattributes
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
editor = nano
pager = less
[color]
ui = auto
interactive = auto
[color "blame"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[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
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[merge]
log = true
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
[user]
name = Tom Davies
email = tom@tomdavies.net
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr) %C(blue)%ci%Creset