-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
67 lines (67 loc) · 1.79 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
62
63
64
65
66
67
[credential]
helper = osxkeychain
[push]
default = simple
[user]
email = jessedupuy@gmail.com
name = Jesse Dupuy
[alias]
br = branch
cm = commit -m
co = checkout
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFX; }; f"
hst = log -p --date=relative
last = log -1 HEAD
lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --date=relative
mergenc = merge --no-commit
st = status
unstage = reset HEAD --
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = " /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED"
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = " /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE"
[filter "lfs"]
clean = git-lfs clean -- %f
process = git-lfs filter-process
required = true
smudge = git-lfs smudge -- %f
[color]
ui = always
[core]
editor = vim
excludesfile = ~/.gitignore_global
# pretty diffs, allow mousewheel scrolling
pager = diff-so-fancy | less --tabs=4 -+FX
[git-up "rebase"]
auto = false
[difftool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
[commit]
template = ~/.stCommitMsg
[fetch]
prune = true
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[pull]
rebase = false