-
Notifications
You must be signed in to change notification settings - Fork 0
/
git.conf
37 lines (33 loc) · 848 Bytes
/
git.conf
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
# Symlinked to ~/.gitconfig
[user]
name = Jacob Oscarson
email = [email protected]
[i18n]
commitencoding = utf-8
[alias]
di = diff --color=always
tbd = diff --cached --color=always
st = status
id = rev-parse --short HEAD
last = log -n 5 --color --oneline
today = log --after=yesterday --oneline
rubbet = add --all :/
fire = !git rubbet && git commit
[color]
status = auto
[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
[push]
default = simple
[core]
excludesfile = ~/src/mine/dotfiles/gitignore
[diff]
tool = delta
[difftool]
prompt = false
[difftool "delta"]
cmd = delta \"$LOCAL\" \"$REMOTE\" \"$MERGED\"