mirror of
https://github.com/kennethreitz-archive/dotfiles.git
synced 2026-06-05 07:26:12 +00:00
82de35feb1
legit integration p4merge tool, color ui rerere
43 lines
907 B
INI
43 lines
907 B
INI
[user]
|
|
email = me@kennethreitz.com
|
|
name = Kenneth Reitz
|
|
[github]
|
|
user = kennethreitz
|
|
[core]
|
|
excludesfile = /Users/kreitz/.global_ignore
|
|
quotepath = false
|
|
[alias]
|
|
update = !gx-update
|
|
issues = gh issues open
|
|
|
|
branches = !legit branches
|
|
br = !legit branches
|
|
graft = !legit graft "$@"
|
|
harvest = !legit harvest "$@"
|
|
publish = !legit publish "$@"
|
|
unpublish = !legit unpublish "$@"
|
|
sprout = !legit sprout "$@"
|
|
sync = !legit sync
|
|
switch = !legit switch "$@"
|
|
i = add -p
|
|
|
|
[difftool "Kaleidoscope"]
|
|
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
|
|
[difftool]
|
|
prompt = false
|
|
[diff]
|
|
tool = Kaleidoscope
|
|
[merge]
|
|
keepBackup = false
|
|
tool = p4merge
|
|
[mergetool "p4merge"]
|
|
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
|
|
keepTemporaries = false
|
|
trustExitCode = false
|
|
keepBackup = false
|
|
[color]
|
|
ui = auto
|
|
interactive = auto
|
|
[rerere]
|
|
enabled = 1
|