Roshan Sharma roshnet

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

It's not immediately obvious how to pull down the code for a PR and test it locally. But it's pretty easy. (This assumes you have a remote for the main repo named upstream.)

Getting the PR code

Make note of the PR number. For example, Rod's latest is PR #37: Psiphon-Labs/psiphon-tunnel-core#37
Fetch the PR's pseudo-branch (or bookmark or rev pointer whatever the word is), and give it a local branch name. Here we'll name it pr37:

$ git fetch upstream pull/37/head:pr37

	#include <stdio.h>
	#include <string.h>
	#include <stdlib.h>
	#include <unistd.h>
	#include <fcntl.h>

	#include <netinet/tcp.h>
	#include <sys/socket.h>
	#include <sys/types.h>
	#include <netinet/in.h>

	#!/usr/bin/env/python
	#
	# More of a reference of using jinaj2 without actual template files.
	# This is great for a simple output transformation to standard out.
	#
	# Of course you will need to "sudo pip install jinja2" first!
	#
	# I like to refer to the following to remember how to use jinja2 :)
	# http://jinja.pocoo.org/docs/templates/
	#

	Latency Comparison Numbers (~2012)
	----------------------------------
	L1 cache reference 0.5 ns
	Branch mispredict 5 ns
	L2 cache reference 7 ns 14x L1 cache
	Mutex lock/unlock 25 ns
	Main memory reference 100 ns 20x L2 cache, 200x L1 cache
	Compress 1K bytes with Zippy 3,000 ns 3 us
	Send 1K bytes over 1 Gbps network 10,000 ns 10 us
	Read 4K randomly from SSD* 150,000 ns 150 us ~1GB/sec SSD

	#!/usr/bin/env python

	import argparse
	import sys

	import jinja2
	import markdown

	TEMPLATE = """<!DOCTYPE html>
	<html>

	#!/bin/bash
	# node-reinstall
	# credit: http://stackoverflow.com/a/11178106/2083544

	## program version
	VERSION="0.0.13"

	## path prefix
	PREFIX="${PREFIX:-/usr/local}"

	//http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
	Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);

	# In this example we're sending some test bitcoins from an address we control to a brand new test
	# address. We'll be sending the coins using the following address, public and private keys (please
	# don't abuse).
	# address : mtWg6ccLiZWw2Et7E5UqmHsYgrAi5wqiov
	# public : 03bb318b00de944086fad67ab78a832eb1bf26916053ecd3b14a3f48f9fbe0821f
	# private : 1af97b1f428ac89b7d35323ea7a68aba8cad178a04eddbbf591f65671bae48a2

	# 1. generate a one-shot dummy address we're going to send money to
	$ curl -X POST http://api.blockcypher.com/v1/btc/test3/addrs
	{