-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
47 lines (47 loc) · 1.2 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
[user]
email = thomas.pinaud@betterise.me
name = Thomas Pinaud
[core]
excludesfile = /Users/spope/.gitignore_global
editor = vim
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[branch]
autosetupmerge = true
[alias]
st = status
ci = commit
br = branch
co = checkout
df = diff
lg = log --graph --oneline --decorate
merge = merge --no-commit
tree = log --graph --full-history --all --color --date=short --pretty=format:'%Cred%x09%h %Creset%ad%Cblue%d %Creset %s %C(bold)(%an)%Creset'
[merge]
conflictstyle = diff3
;tool = meld
;tool = vimdiff
[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
[commit]
template = /Users/spope/.stCommitMsg