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.

nicoulaj

#!/bin/sh​
# Build Zsh from sources on Ubuntu.
# From http://zsh.sourceforge.net/Arc/git.html and sources INSTALL file.

# Some packages may be missing
sudo apt-get install -y git-core gcc make autoconf yodl libncursesw5-dev texinfo

git clone git://zsh.git.sf.net/gitroot/zsh/zsh

cd zsh

knzconnor

# RSpec's subject method, both implicitly and explicitly set, is useful for
# declaratively setting up the context of the object under test. If you provide a
# class for your describe block, subject will implicitly be set to a new instance
# of this class (with no arguments passed to the constructor). If you want
# something more complex done, such as setting arguments, you can use the
# explicit subject setter, which takes a block.
describe Person do
  context "born 19 years ago" do
    subject { Person.new(:birthdate => 19.years.ago }
    it { should be_eligible_to_vote }

darktable

application: you-app-name-here
version: 1
runtime: python
api_version: 1

default_expiration: "30d"

handlers:
- url: /(.*\.(appcache|manifest))
  mime_type: text/cache-manifest

zenkay

Ruby, RVM and Mountain Lion

Key problems

Mountain Lion (10.8) has three main difference compared to Lion (10.7):

• XCode 4.4 does not install Command Line Tools by default
• X11 isn't available anymore
• The installed version of OpenSSL has some bugs

How to work around

dentearl

# primate version
for f in ../packagePrimates/analysis/comparatorWrapper-primates.*/; do 
  for c in A B C D; do
    ##########
    # This block holds the background process count in check
    while [ $(jobs | wc -l) -gt 0 ]; do 
      sleep 2; 
    done; 
    ##########
    for partner in simChimp simGorilla simOrang; do 

roberto

<% flash.each do |type, message| %>
  <div class="alert <%= bootstrap_class_for(type) %> fade in">
    <button class="close" data-dismiss="alert">×</button>
    <%= message %>
  </div>
<% end %>

meonkeys

// I wanted to know the top five largest collections in my MongoDB database in
// terms of document count. This MongoDB-specific JavaScript gets the job done.
//
// Edit variables in the config section, then execute like so:
//
//    mongo --quiet topCollections.js


// config
var dbname = 'FIXME';

nixpulvis

#!/usr/bin/env ruby
# Remove all gems EXCEPT defaults :)

`gem list -d`.split(/\n\n^(?=\w)/).each do |data|
  match = data.match(/(?<name>([^\s]+)) \((?<versions>.*)\)/)
  name = match[:name]
  versions = match[:versions].split(', ')

  if match = data.match(/^.*\(([\d\.]*),? ?default\): .*$/)
    next if match[1].empty? # it's the only version if this match is empty

jeremyjarrell

<project name="migrations">

  <target name="prefix-new-migrations">
  	<foreach target="rename-file" param="the-file">
			<path>
        <!-- The hardcoded directory containing the migrations -->
				<fileset dir="./src/db/migrations" casesensitive="no" includes="*.sql">
          <!-- Exclude any migration files which have already been prefixed -->
					<not>
    					<filename regex="\d+__.*" casesensitive="true"/>