Steve Smythe ssmythe

## gist:1b44f58b97624842529179a11d821a38
# 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

## setup-vagrant-macosx.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                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.

  
## vimtutor
sudo yum -y install vim-enhanced
vimtutor
	# 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