anaisbetts

git remote add upstream [Clone Url]
git fetch upstream
git checkout master

## At this point, you have two options:

git merge upstream/master   # Merge yours and theirs
git push origin master     # Push back to your fork

git reset --hard upstream/master    # Make yours look *exactly* like theirs, lose your changes;

holman

So I sent this to the company:

and then there was this:

dylanegan

Tendercrawl: I came for the crack, but stayed for the cocktails.

Friday, August 26.

Amsterdam Cafe (19:30)

The bar tender is also a lady beer nerd.

http://www.amsterdamcafesf.com/

itsadok

/*
 * jQuery selectbox plugin
 *
 * Copyright (c) 2007 Sadri Sahraoui (brainfault.com)
 * Licensed under the GPL license and MIT:
 *   http://www.opensource.org/licenses/GPL-license.php
 *   http://www.opensource.org/licenses/mit-license.php
 *
 * The code is inspired from Autocomplete plugin (http://www.dyve.net/jquery/?autocomplete)
 *

protocool

/*
  As of version 1.1.2, Propane will load and execute the contents of
  ~Library/Application Support/Propane/unsupported/caveatPatchor.js
  immediately following the execution of its own enhancer.js file.

  You can use this mechanism to add your own customizations to Campfire
  in Propane.

  Below you'll find two customization examples.

isaacs

echo 'export PATH=$HOME/local/bin:$PATH' >> ~/.bashrc
. ~/.bashrc
mkdir ~/local
mkdir ~/node-latest-install
cd ~/node-latest-install
curl http://nodejs.org/dist/node-latest.tar.gz | tar xz --strip-components=1
./configure --prefix=~/local
make install # ok, fine, this step probably takes more than 30 seconds...
curl https://www.npmjs.org/install.sh | sh