Erwan d'Orgeville edorgeville

Example: Moving up to a few commits to another branch

Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.

cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated

git checkout branch-B
git cherry-pick X
git cherry-pick Y

Virtual Hosts on nginx (CSC309)

When hosting our web applications, we often have one public IP address (i.e., an IP address visible to the outside world) using which we want to host multiple web apps. For example, one may wants to host three different web apps respectively for example1.com, example2.com, and example1.com/images on the same machine using a single IP address.

How can we do that? Well, the good news is Internet browsers

###Invite your readers to leave you a Bitcoin tip on Reddit

Reddit's Bitcoin implementation is ideal for beginners. Here's how to get them to give it a try.

####Structure

	using System;

	namespace FortyOneShades
	{
	class Program
	{
	static int[] values = new int[]{
	0x276AD9,
	0x3E6FD9,
	0x3A6FDE,

	# app/controllers/application_controller.rb

	class ApplicationController < ActionController::Base
	# Prevent CSRF attacks by raising an exception.
	# For APIs, you may want to use :null_session instead.
	protect_from_forgery with: :exception
	add_flash_types :success, :error

	# See:
	# https://stackoverflow.com/questions/2385799/how-to-redirect-to-a-404-in-rails

	# Ask for the user password
	# Script only works if sudo caches the password for a few minutes
	sudo true

	# Install kernel extra's to enable docker aufs support
	# sudo apt-get -y install linux-image-extra-$(uname -r)

	# Add Docker PPA and install latest version
	# sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
	# sudo sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"

	class API::V1::BaseController < ApplicationController

	skip_before_filter :verify_authenticity_token

	before_filter :cors_preflight_check
	after_filter :cors_set_access_control_headers

	def cors_set_access_control_headers
	headers['Access-Control-Allow-Origin'] = '*'
	headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, DELETE, OPTIONS'

	# Compiled source #
	###################
	*.com
	*.class
	*.dll
	*.exe
	*.o
	*.so

	# Packages #

	░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░
	░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
	░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░
	░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
	░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░
	░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
	░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░
	░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
	░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░
	░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░

	#!/usr/bin/env bash
	# Generates gource video (h.264) out of multiple repositories.
	# Pass the repositories in command line arguments.
	# Example:
	# <this.sh> /path/to/repo1 /path/to/repo2

	i=0
	for repo in $*; do
	# 1. Generate a Gource custom log files for each repo. This can be facilitated by the --output-custom-log FILE option of Gource as of 0.29:
	logfile="$(mktemp /tmp/gource.XXXXXX)"