-
Notifications
You must be signed in to change notification settings - Fork 6
Expand file tree
/
Copy pathgitconfig
More file actions
40 lines (40 loc) · 883 Bytes
/
gitconfig
File metadata and controls
40 lines (40 loc) · 883 Bytes
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
[include]
path = ~/.gitconfig_username
[color]
branch = auto
diff = auto
status = auto
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red
new = cyan
[color "status"]
added = yellow
changed = green
untracked = cyan
[push]
default = simple
excludesfile = ~/.gitignore_global
[alias]
gr = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m"
[diff]
tool = diffmerge
[difftool "diffmerge"]
com = "diffmerge \"$LOCAL\" \"$REMOTE\" "
[merge]
tool = diffmerge
[mergetool "diffmerge"]
trustExitCode = true
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" "
[credential]
helper = osxkeychain
[user]
name = John Morales
[include]
path = ~/.git_email