-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
61 lines (61 loc) · 1.32 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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
[alias]
br = branch
ch = checkout
co = commit
coa = commit --amend -C HEAD
cop = commit -p
di = diff
fe = fetch
me = merge
ps = push
pl = pull
re = reset
rb = rebase
st = status
dt = difftool
hist = log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
lol = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
mylog = log --pretty=format:'%h %s [%an]' --graph
[branch]
autosetuprebase = always
[color]
ui = true
[core]
editor = nvim
excludesfile = ~/.gitignore_global
preloadindex = true
autocrlf = input
[diff]
tool = ydiff
guitool = ydiff
[difftool "ydiff"]
cmd = ydiff -s -w 0 --wrap
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[include]
path = ~/.gitconfig.local
[merge]
defaulttoupstream = true
tool = bc3
[mergetool]
prompt = false
keepbackup = false
[push]
default = current
[pull]
rebase = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[user]
name = Jeremy Kassis
email = [email protected]
[commit]
template = ~/.stCommitMsg
[fetch]
prune = true