katylava

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.

mathiasbynens

// Original code from http://www.blog.highub.com/mobile-2/a-fix-for-iphone-viewport-scale-bug/

var metas = document.getElementsByTagName('meta');
var i;
if (navigator.userAgent.match(/iPhone/i)) {
	for (i=0; i<metas.length; i++) {
		if (metas[i].name == "viewport") {
			metas[i].content = "width=device-width, minimum-scale=1.0, maximum-scale=1.0";
		}
	}

sn00011

# brew install re2c graphviz
# cd /tmp
# wget http://pecl.php.net/get/xhprof-0.9.2.tgz
# tar -xvzf xhprof-0.9.2.tgz
# cd xhprof-0.9.2/extension
# phpize
# MACOSX_DEPLOYMENT_TARGET=10.6 CFLAGS="-arch i386 -arch x86_64 -g -Os -pipe -no-cpp-precomp" CCFLAGS="-arch i386 -arch x86_64 -g -Os -pipe" CXXFLAGS="-arch i386 -arch x86_64 -g -Os -pipe" LDFLAGS="-arch i386 -arch x86_64 -bind_at_load"
# export CFLAGS CXXFLAGS LDFLAGS CCFLAGS MACOSX_DEPLOYMENT_TARGET
# ./configure --with-php-config=/usr/local/zend/bin/php-config
# make

pjkix

#!/bin/bash

## v1.0.6
## this script will gernerate css stats

### example output

# CSS STATS
# ----------
# Floats:  132

sanguis

<?php
/**
 * returns a array for use with #options in a form field
 * */
function taxonomy_options_array($machine_name, $all = NULL) {
  $v = taxonomy_vocabulary_machine_name_load($machine_name);

  if (!empty($all)) {
    $options[$all[0]] = $all[1];
  }

davereid

<?php

/**
 * Implements hook_drush_command().
 */
function custom_local_drush_command() {
  $items['files-fix-permissions'] = array(
    'description' => 'Fix file permissions',
    'options' => array(
      'owner' => "The name of the user to assign ownership of all files with chown(). Defaults to \$USER.",

piscisaureus

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = git@github.com:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

netsensei

<?php

/**
 * @file
 *
 * Minimal AJAX page. Call like this:
 *  $.ajax({
 *       type: 'GET',
 *       url: '/drupal-ajax.php?param1=...
 *       data: {},