Sinner Orivee orivee

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

Markdown and reStructuredText

GitHub supports several lightweight markup languages for documentation; the most popular ones (generally, not just at GitHub) are Markdown and reStructuredText. Markdown is sometimes considered easier to use, and is often preferred when the purpose is simply to generate HTML. On the other hand, reStructuredText is more extensible and powerful, with native support (not just embedded HTML) for tables, as well as things like automatic generation of tables of contents.

tmux cheat sheet

(C-x means ctrl+x, M-x means alt+x)

Prefix key

The default prefix is C-b. If you (or your muscle memory) prefer C-a, you need to add this to ~/.tmux.conf:

remap prefix to Control + a

	# ~/.tmux.conf
	#
	# See the following files:
	#
	# /opt/local/share/doc/tmux/t-williams.conf
	# /opt/local/share/doc/tmux/screen-keys.conf
	# /opt/local/share/doc/tmux/vim-keys.conf
	#
	# URLs to read:
	#

	#!/bin/sh

	# Converts a mysqldump file into a Sqlite 3 compatible file. It also extracts the MySQL `KEY xxxxx` from the
	# CREATE block and create them in separate commands _after_ all the INSERTs.

	# Awk is choosen because it's fast and portable. You can use gawk, original awk or even the lightning fast mawk.
	# The mysqldump file is traversed only once.

	# Usage: $ ./mysql2sqlite mysqldump-opts db-name \| sqlite3 database.sqlite
	# Example: $ ./mysql2sqlite --no-data -u root -pMySecretPassWord myDbase \| sqlite3 database.sqlite

	#!/bin/bash
	#
	# DESCRIPTION:
	#
	# Set the bash prompt according to:
	# * the active virtualenv
	# * the branch/status of the current git repository
	# * the return value of the previous command
	# * the fact you just came from Windows and are used to having newlines in
	# your prompts.

	# dropping a database via pymongo
	from pymongo import Connection
	c = Connection()
	c.drop_database('mydatabase')

	# drop a collection via pymongo
	from pymongo import Connection
	c = Connection()
	c['mydatabase'].drop_collection('mycollection')

	ff="/tmp/monsterwm.fifo"
	[[ -p $ff ]] \|\| mkfifo -m 600 "$ff"

	# desktop names
	ds=("web" "dev" "foo" "null")

	# layout names
	ms=("T" "M" "B" "G" "F")

	while read -t 60 -r wmout \|\| true; do

	# How to generate a secret key with Python
	# via http://flask.pocoo.org/docs/quickstart/

	import os
	os.urandom(24)

	## Configure eth0
	#
	# vi /etc/sysconfig/network-scripts/ifcfg-eth0

	DEVICE="eth0"
	NM_CONTROLLED="yes"
	ONBOOT=yes
	HWADDR=A4:BA:DB:37:F1:04
	TYPE=Ethernet
	BOOTPROTO=static