git config cleanup wip
This commit is contained in:
parent
c39752f239
commit
09363311c9
@ -9,26 +9,33 @@
|
||||
[core]
|
||||
excludesFile = ~/.config/git/ignore
|
||||
quotepath = false
|
||||
|
||||
[pull]
|
||||
rebase = true
|
||||
|
||||
[alias]
|
||||
df = difftool
|
||||
|
||||
[filter "lfs"]
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
|
||||
[push]
|
||||
autoSetupRemote = true
|
||||
|
||||
# Diffs and Merges {{{
|
||||
[diff]
|
||||
tool = Kaleidoscope
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
trustExitCode = true
|
||||
|
||||
[merge]
|
||||
tool = Kaleidoscope
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
conflictstyle = diff3
|
||||
@ -62,17 +69,4 @@
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustExitCode = true
|
||||
# }}}
|
||||
[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
|
||||
[user]
|
||||
name = Tony Miller
|
||||
email = aermolenko@atlassian.com
|
||||
[trace2]
|
||||
eventTarget = af_unix:/Users/aermolenko/.gittrace/trace.sock
|
||||
eventBrief = true
|
||||
eventNesting = 1
|
||||
configparams = custom.metacommands
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user