athaller

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.

Answer by Jim Dennis on Stack Overflow question http://stackoverflow.com/questions/1218390/what-is-your-most-productive-shortcut-with-vim/1220118#1220118

Your problem with Vim is that you don't grok vi.

You mention cutting with yy and complain that you almost never want to cut whole lines. In fact programmers, editing source code, very often want to work on whole lines, ranges of lines and blocks of code. However, yy is only one of many way to yank text into the anonymous copy buffer (or "register" as it's called in vi).

The "Zen" of vi is that you're speaking a language. The initial y is a verb. The statement yy is a simple statement which is, essentially, an abbreviation for 0 y$:

0 go to the beginning of this line. y yank from here (up to where?)

Multiple SSH Keys settings for different github account

create different public key

create different ssh key according the article Mac Set-Up Git

$ ssh-keygen -t rsa -C "[email protected]"

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

	<?php
	/**
	* Convert a comma separated file into an associated array.
	* The first row should contain the array keys.
	*
	* Example:
	*
	* @param string $filename Path to the CSV file
	* @param string $delimiter The separator used in the file
	* @return array

	From 9fbd75b0ba43d2e37aae4ed1b48752baa1908cd3 Mon Sep 17 00:00:00 2001
	From: Akinori MUSHA <[email protected]>
	Date: Tue, 5 Jul 2011 11:00:32 +0900
	Subject: [PATCH] Make copy() also save the selected text in rich text format.

	---
	Headers/iTerm/PTYTextView.h \| 2 +
	PTYTextView.m \| 161 +++++++++++++++++++++++++++++++++++++++++-
	2 files changed, 159 insertions(+), 4 deletions(-)

	$stop = $args.Count
	$inputIP = ""
	$inputFile = ""
	$knownIPFile = ""
	$showUsage = 0
	$verbose = 0
	for ($i = 0; $i -lt $stop; $i++)
	{
	if ($args[$i] -eq "-f") {
	if ( ($i + 1) -eq $stop) {

	<?php
	/**
	* Sends a simple email.
	* [or] Tested on 2012-05-31 using Drupal 7.12
	*
	* Usage:
	* 1) Paste all the below code into your module or include
	* 2) Configure the two @FIXME's.
	* 3) Visit /_custom_simple_mail to get an email.
	*

	<?php
	// Machine name for our custom node
	define('NODE_NAME', 'the_node_machine_name');
	// Machine name for our custom taxonomy
	define('TAXONOMY_NAME', 'the_taxonomy_machine_name');

	function module_install() {
	_create_taxonomy();
	_create_content_type();
	}