config/gitconfig at master · vlsd/config · GitHub

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
[user]
	name = Vlad Seghete
	email = vlad.seghete@gmail.com
[alias]
    pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
[core]
	editor = vim
	excludesfile = /Users/vlad/.gitignore_global
[color]
	ui = true
[push]
	default = upstream
[diff]
    tool = mvimdiff
[merge]
    tool = mvimdiff
[difftool "gvimdiff"]
	path = /opt/local/bin/mvimdiff
[mergetool "mvimdiff"]
	cmd = /opt/local/bin/mvimdiff -f "$LOCAL" "$MERGED" "$REMOTE"
[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
[credential]
	helper = osxkeychain
[filter "lfs"]
	clean = git lfs clean %f
	smudge = git lfs smudge %f
	required = true