Alexander Buch bucha

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.

Magento Code Snippets

Download extension manually using mage

./mage config-set preferred_state stable
./mage clear-cache
./mage sync
./mage download community Module_Name

Set the Mac OS X SOCKS proxy on the command line

a.k.a. what to do when your ISP starts blocking sites :(

Set the SOCKS proxy to local SSH tunnel

networksetup -setsocksfirewallproxy "Ethernet" localhost 8080

To clear the domain and port

	<?php
	/**
	* This program is free software. It comes without any warranty, to
	* the extent permitted by applicable law. You can redistribute it
	* and/or modify it under the terms of the Do What The Fuck You Want
	* To Public License, Version 2, as published by Sam Hocevar. See
	* http://sam.zoy.org/wtfpl/COPYING for more details.
	*/

	/**

	#import <Foundation/Foundation.h>

	@interface Communicator : NSObject <NSStreamDelegate> {
	@public

	NSString *host;
	int port;
	}

	- (void)setup;

	var http = require("http"),
	url = require("url"),
	path = require("path"),
	fs = require("fs")
	port = process.argv[2] \|\| 8888;

	http.createServer(function(request, response) {

	var uri = url.parse(request.url).pathname
	, filename = path.join(process.cwd(), uri);

	<?php
	/**
	* Magento version/edition helper for determining the Magento BASE version (regardless of edition) and adds functions to check if Enterprise, Professional or Community are being run.
	* Adds isMageCommunity(), isMageProfessional() and isMageEnterprise()
	*
	* @category TBT
	* @package TBT_Rewards
	* @author WDCA Sweet Tooth Team <[email protected]>
	*/
	class TBT_Rewards_Helper_Version extends Mage_Core_Helper_Abstract {

	'use strict';

	// Add ECMA262-5 method binding if not supported natively
	//
	if (!('bind' in Function.prototype)) {
	Function.prototype.bind= function(owner) {
	var that= this;
	if (arguments.length<=1) {
	return function() {
	return that.apply(owner, arguments);

	<?php
	/**
	* Set global/skip_process_modules_updates to '1' in app/etc/local.xml and
	* then use this script to apply updates and refresh the config cache without
	* causing a stampede on the config cache.
	*
	* @author Colin Mollenhour
	*/
	umask(0);
	ini_set('memory_limit','512M');

	<?php
	/*
	* Iteration and Recursive Iteration Examples Code
	*
	* @link http://stackoverflow.com/questions/12077177/how-does-recursiveiteratoriterator-works-in-php
	* @author hakre <http://hakre.wordpress.com>
	*/

	### To have these examples to work, a directory with subdirectories is needed,
	### I named mine "tree":