Chengzhi Yang czyang

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.

Title

<Additional information about your API call. Try to use verbs that match both request type (fetching vs modifying) and plurality (one vs multiple).>

URL

<The URL Structure (path only, no root url)>
Method:

OS X Screencast to animated GIF

This gist shows how to create a GIF screencast using only free OS X tools: QuickTime, ffmpeg, and gifsicle.

Instructions

To capture the video (filesize: 19MB), using the free "QuickTime Player" application:

Let's say you have an iOS project, and you want to use some external library, like AFNetworking. How do you integrate it?

With submodules

Add the project to your repo:

git submodule add [email protected]:AFNetworking/AFNetworking.git Vendor/AFNetworking

or something to that effect.

	#!/bin/zsh

	# This script deletes the least-recently used (LRU) files from Polipo's cache
	# once the partition it is on has less than $min_disk_free Bytes of free space
	# left.
	#
	# It's meant to be used as a cron job, and it's a little more complicated than
	# it needs to be, because I wrote it mostly to learn zsh.

	local cache_dir="/var/cache/polipo/"

	#import <Foundation/Foundation.h>

	@interface Communicator : NSObject <NSStreamDelegate> {
	@public

	NSString *host;
	int port;
	}

	- (void)setup;

	package main

	import (
	"bytes"
	"encoding/hex"
	"flag"
	"fmt"
	"io"
	"log"
	"net"

	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

	// Photoshop Script to Create iPhone Icons from iTunesArtwork
	//
	// WARNING!!! In the rare case that there are name collisions, this script will
	// overwrite (delete perminently) files in the same folder in which the selected
	// iTunesArtwork file is located. Therefore, to be safe, before running the
	// script, it's best to make sure the selected iTuensArtwork file is the only
	// file in its containing folder.
	//
	// Copyright (c) 2010 Matt Di Pasquale
	// Added tweaks Copyright (c) 2012 by Josh Jones http://www.appsbynight.com

	git rm -r --cached node_modules
	git commit -m 'Remove the now ignored directory node_modules'
	git push origin master