-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
44 lines (44 loc) · 1.16 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
[user]
sx
name = Duncan Williams
email = [email protected]
[push]
default = current
[alias]
u = add -u
c = commit
graph = log --graph --all --pretty=format:'%C(dim normal)%h%C(reset) %C(blue)%an%Creset %s %C(yellow)%cr %C(auto)%d%Creset' --abbrev-commit
upstream = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
[pull]
default = simple
[core]
excludesfile = /Users/duncan/.gitignore_global
[merge]
tool = fugitive
[mergetool "meld"]
cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" --output \"$MERGED\"
[mergetool "fugitive"]
cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\"
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
# [credential]
# helper = osxkeychain
[commit]
verbose = true
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[init]
templatedir = ~/.git-templates
[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