forked from byteslayer7/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
38 lines (38 loc) · 1.04 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
[user]
email = [email protected]
name = Casey Duplantis
[alias]
st = status -sb
ci = commit
br = branch
co = checkout
df = diff
ready = rebase -i @{u}
lg = log --no-merges --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cD) %C(bold blue)<%an>%Creset' --since yesterday --author Alex
purr = pull --rebase
[push]
default = simple
[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
trustExitCode = true
cmd = `/usr/local/bin/bcomp $LOCAL $REMOTE`
[merge]
tool = bc4
[mergetool]
prompt = false
[mergetool "bc4"]
trustExitCode = true
cmd = `/usr/local/bin/bcomp $LOCAL $REMOTE $BASE $MERGED`
[core]
editor = vim
excludesfile = /Users/cduplantis/.gitignore_global
[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