seathief

//Git Mergetool and difftool with Beyond Compare 4
//Install command line tools
//For osx
//IF running this command in git bash then escape $ with \
git config --global diff.tool bcomp
git config --global difftool.bcomp.cmd "\"bcomp\" \"\$LOCAL\" \"\$REMOTE\""
git config --global difftool.prompt false

git config --global merge.tool bcomp
git config --global mergetool.bcomp.cmd "\"bcomp\" \"\$LOCAL\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""

seathief

$ tmux attach
protocol version mismatch (client 7, server 6)

$ pgrep tmux
3429
$ /proc/3429/exe attach

seathief

#!/bin/bash

sudo mount -o remount,size=10G,noatime /tmp
echo "Done. Please use 'df -h' to make sure folder size is increased."