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.

stchris

#!/usr/bin/env python
"""
getimg.py

Gets the current image of the day from NASA and sets it as the
background in Gnome. The summary / description text is written
to the image.

Requires:
    PIL             (apt-get install python-imaging or pip install PIL)

oxbowlakes

/**
 * Part Zero : 10:15 Saturday Night
 *
 * (In which we will see how to let the type system help you handle failure)...
 *
 * First let's define a domain. (All the following requires scala 2.9.x and scalaz 6.0)
 */

import scalaz._
import Scalaz._

gist:1406238

Originally:
https://gist.github.com/7565976a89d5da1511ce

Hi Donald (and Martin),

Thanks for pinging me; it's nice to know Typesafe is keeping tabs on this, and I
appreciate the tone. This is a Yegge-long response, but given that you and
Martin are the two people best-situated to do anything about this, I'd rather
err on the side of giving you too much to think about. I realize I'm being very
critical of something in which you've invested a great deal (both financially

roman-yepishev

#!/usr/bin/env python

import sys
import gdbm
 
from twisted.conch.unix import UnixSSHRealm
from twisted.cred import portal
from twisted.cred.credentials import IUsernamePassword
from twisted.cred.checkers import ICredentialsChecker
from twisted.cred.error import UnauthorizedLogin

olasitarska

# -*- coding: utf-8 -*-
"""
Builds epub book out of Paul Graham's essays: http://paulgraham.com/articles.html

Author: Ola Sitarska <ola@sitarska.com>
Copyright: Licensed under the GPL-3 (http://www.gnu.org/licenses/gpl-3.0.html)

This script requires python-epub-library: http://code.google.com/p/python-epub-builder/
"""

ndarville

Business Models

Advertising

Models	Examples
Display ads	Yahoo!
Search ads	Google

Tho85

Build your own private, encrypted, open-source Dropbox-esque sync folder

Prerequisites:

• One or more clients running a UNIX-like OS. Examples are given for Ubuntu 12.04 LTS, although all software components are available for other platforms as well (e.g. OS X). YMMV
• A cheap Ubuntu 12.04 VPS with storage. I recommend Backupsy, they offer 250GB storage for $5/month. Ask Google for coupon codes.

Software components used:

• Unison for file synchronization
• EncFS for folder encryption

blueyed

# Complete words from tmux pane(s) {{{1
# Source: http://blog.plenz.com/2012-01/zsh-complete-words-from-tmux-pane.html
# Gist: https://gist.github.com/blueyed/6856354
_tmux_pane_words() {
  local expl
  local -a w
  if [[ -z "$TMUX_PANE" ]]; then
    _message "not running inside tmux!"
    return 1
  fi

youribonnaffe

apply plugin: 'idea'
    idea.module.iml {
        def customDependencies = ['org.objectweb.proactive', 'org.ow2.proactive']
        whenMerged { module ->
            // to reorder dependencies
            def existingDependencies = module.dependencies
            module.dependencies = new LinkedHashSet()
            configurations.compile.resolvedConfiguration.resolvedArtifacts.each {
                if (it.moduleVersion.id.group == project.group || customDependencies.contains(it.moduleVersion.id.group) ) {
                    logger.info("Custom idea: adding ${it.name}")