Jonny Williams jonnyhtw

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

	set imap_user = '[email protected]'
	set imap_pass = 'pass'
	set spoolfile = imaps://imap.gmail.com:993/INBOX
	set folder = imaps://imap.gmail.com:993
	set record="imaps://imap.gmail.com/[Gmail]/Sent Mail"
	set postponed=”imaps://imap.gmail.com/[Gmail]/Drafts”
	set message_cachedir=”~/.mutt/cache/bodies”
	set certificate_file=~/.mutt/certificates

	set smtp_url = "smtp://[email protected]:587/"

	"""Contours with overlap control.

	This script generates widely spaced black contours, with a gray patch in a
	subregion where more finely-spaced colored contours are visible. The gray
	patch covers the black contours.
	"""

	import numpy as np
	import matplotlib.mlab as mlab
	from matplotlib.patches import Rectangle

	# from https://libbits.wordpress.com/2011/04/09/get-total-rsync-progress-using-python/

	import subprocess
	import re
	import sys

	print('Dry run:')
	cmd = 'rsync -az --stats --dry-run ' + sys.argv[1] + ' ' + sys.argv[2]
	proc = subprocess.Popen(cmd,
	shell=True,

	# basic .muttrc for use with Gmail

	# Change the following six lines to match your Gmail account details
	set imap_user = "[email protected]"
	set imap_pass = ""
	set smtp_url = "smtp://[email protected]:587/"
	set smtp_pass = ""
	set from = "[email protected]"
	set realname = "Firstname Lastname"
	#

	#!/bin/bash

	# Script for installing tmux on systems where you don't have root access.
	# tmux will be installed in $HOME/local/bin.
	# It's assumed that wget and a C/C++ compiler are installed.

	# exit on error
	set -e

	TMUX_VERSION=1.8

	#!/bin/bash
	#
	# matrix: matrix-ish display for Bash terminal
	# Author: Brett Terpstra 2012 <http://brettterpstra.com>
	# Contributors: Lauri Ranta and Carl <http://blog.carlsensei.com/>
	#
	# A morning project. Could have been better, but I'm learning when to stop.

	### Customization:
	blue="\033[0;34m"

	#!/bin/bash

	mkdir ~/local
	mkdir ~/build

	export TARGET_DIR="$HOME/local"
	cd ~/build

	hg clone http://hg.debian.org/hg/pkg-vim/vim
	cd vim