Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setup sublime settings #19

Open
1 task
deekim opened this issue Jun 13, 2022 · 0 comments
Open
1 task

Setup sublime settings #19

deekim opened this issue Jun 13, 2022 · 0 comments

Comments

@deekim
Copy link
Owner

deekim commented Jun 13, 2022 •
edited
Loading 

{ "save_on_focus_lost": true }

Sublime Merge

sudo ln -s "/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge" /usr/local/bin/smerge
git config mergetool.smerge.cmd 'smerge mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"'
git config mergetool.smerge.trustExitCode true
git config merge.tool smerge

todo

  • add git mergetool alias
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@deekim