mirror of
https://github.com/tylernguyen/dotfiles.git
synced 2025-02-05 01:03:15 -06:00
19 lines
391 B
Cheetah
19 lines
391 B
Cheetah
[data]
|
|
name = "Tyler Nguyen"
|
|
email = "{{ onepasswordRead "op://Private/Tyler Nguyen/Identification/Public Email" }}"
|
|
|
|
[edit]
|
|
command = "code"
|
|
args = ["--wait"]
|
|
|
|
[diff]
|
|
tool = default-difftool
|
|
|
|
[difftool "default-difftool"]
|
|
cmd = code --wait --diff $LOCAL $REMOTE
|
|
|
|
[merge]
|
|
tool = code
|
|
|
|
[mergetool "code"]
|
|
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
|