forked from paulirish/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 4
/
.gitconfig
52 lines (52 loc) · 1.37 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
# [alias]
# c = commit -am
# up = pull
# p = push
# s = status -s
# df = diff --color --color-words --abbrev
# lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
[color]
ui = always
# [apply]
# whitespace = fix
[core]
editor = subl -w
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
[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
# [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 = Ryan Arneson
email = arneson@gmail.com
[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