-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy path_gitconfig
More file actions
64 lines (54 loc) · 1.4 KB
/
Copy path_gitconfig
File metadata and controls
64 lines (54 loc) · 1.4 KB
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
[user]
name = Jeff Brateman
email = braebot@gmail.com
[core]
whitespace = nowarn
autocrlf = input
excludesfile = /Users/brateman/.gitignore
editor = subl -w -n
[color]
ui = true
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
[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
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
[branch]
autosetupmerge = always
[credential]
helper = osxkeychain
[fetch]
recurseSubmodules = yes
[push]
default = simple
[gist]
browse = yes
private = no
[pygithooks]
pep8-ignore = E501,E261,E302
pep8-exclude = ^.*/migrations/.*.py
# FileMerge (opendiff) ships with the Xcode Command Line Tools and is driven
# natively by git — no custom cmd needed. Handles both 2-way diff and 3-way merge.
[diff]
tool = opendiff
[difftool]
prompt = false
[merge]
tool = opendiff