forked from burnto/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
/
_gitconfig
64 lines (63 loc) · 1.76 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
[color]
branch = auto
diff = auto
status = auto
[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]
ui = true
[core]
whitespace=nowarn
excludesfile = /Users/brateman/.gitignore
autocrlf = input
editor = /usr/local/bin/subl -w -n
[alias]
unstage = reset HEAD
pretty-log-color = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --no-merges
pretty-log = log --pretty=format:'%h -%d %s (%cr) <%an>' --abbrev-commit --date=relative --no-merges
changelog = log --pretty=format:'%cd - %h -%d %s' --abbrev-commit --no-merges --date=short
[branch]
autosetupmerge = always
[gist]
browse = yes
private = no
[pygithooks]
pep8-ignore = E501,E261,E302
pep8-exclude = ^.*/migrations/.*.py
[user]
name = Jeff Brateman
email = braebot@gmail.com
[credential]
helper = osxkeychain
[fetch]
recurseSubmodules = yes
[push]
default = simple
[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
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[alias]
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"