Skip to content

Instantly share code, notes, and snippets.

View ssmythe's full-sized avatar

Steve Smythe ssmythe

  • Reno, NV, USA
  • 22:58 (UTC -08:00)
View GitHub Profile
@ssmythe
ssmythe / gist:1b44f58b97624842529179a11d821a38
Last active March 23, 2020 17:30 — forked from kylefox/gist:4512777
If you want to use diffmerge as your git mergetool, this is how you set it up.
# Install diffmerge on macOS
brew cask install diffmerge
# Set "diffmerge" as the default difftool globally:
git config --global diff.tool diffmerge
# Set "diffmerge" as the default mergetool globally:
git config --global merge.tool diffmerge
@ssmythe
ssmythe / setup-vagrant-macosx.md
Created September 9, 2017 05:16 — forked from tomysmile/setup-vagrant-macosx.md
How to Install Virtualbox and Vagrant on MacOSX

Install Virtualbox && Vagrant for MacOSX

Vagrant uses Virtualbox to manage the virtual dependencies. You can directly download virtualbox and install or use homebrew for it.

$ brew cask install virtualbox

Now install Vagrant either from the website or use homebrew for installing it.

@ssmythe
ssmythe / vimtutor
Last active September 23, 2015 23:40 — forked from msanroman/vimtutor
Installing vimtutor
sudo yum -y install vim-enhanced
vimtutor