tony/dotfiles
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

git config cleanup wip

Browse Source
This commit is contained in:
Tony Miller 2025-08-21 22:37:11 +10:00
parent c39752f239
commit 09363311c9
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.config/git/config
View File

@ -9,26 +9,33 @@
[core] [core]
excludesFile = ~/.config/git/ignore excludesFile = ~/.config/git/ignore
quotepath = false quotepath = false
[pull] [pull]
rebase = true rebase = true
[alias] [alias]
df = difftool df = difftool
[filter "lfs"] [filter "lfs"]
required = true required = true
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
[push] [push]
autoSetupRemote = true autoSetupRemote = true
# Diffs and Merges {{{ # Diffs and Merges {{{
[diff] [diff]
tool = Kaleidoscope tool = Kaleidoscope
[difftool] [difftool]
prompt = false prompt = false
trustExitCode = true trustExitCode = true
[merge] [merge]
tool = Kaleidoscope tool = Kaleidoscope
[mergetool] [mergetool]
prompt = false prompt = false
conflictstyle = diff3 conflictstyle = diff3
@ -62,17 +69,4 @@
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true 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