k keikoro

Intro

Setup GitHub Pages "gh-pages" branch as a subfolder within the "master" project on your local checkout.

IMPORTANT

If you plan on switching between different branches (e.g. git checkout master-experiment then revert back with git checkout master) you will loose your child folder from this tutorial (because it's in your .gitignore and is not part of your master branch).

Intro

Description: Setup GitHub Pages "gh-pages" branch and "master" branch as subfolders of a parent project folder ("grandmaster").

Author: Chris Jacob @_chrisjacob

Tutorial (Gist): https://gist.github.com/833223

The Result

If someone forks a gist and you'd like to merge their changes. Do this:

clone your repo, I use the name of the gist

 git clone git://gist.github.com/1163142.git gist-1163142

add a remote for the forked gist, I'm using the name of my fellow developer
```
 git remote add aaron git://gist.github.com/1164196.git
```

	#!/usr/bin/env python
	# encoding: utf-8

	"""
	localetest.py - tests collation / sort order for various Latin-script locales

	Correct output:

	The order for German is:
	LATIN SMALL LETTER A

	#include <stdio.h>
	#include <string.h>
	#include <locale.h>

	int main (void) {

	struct lconv locale_structure;
	struct lconv *locale_ptr = &locale_structure;

	char *a = "ä";

	(*
	iTerm Here - Michael "Doc" Norton

	Version 0.1.1

	A Button for opening the iTerm.app and CD-ing to the location of the selected files or folder.
	Inspired by the workflow from Jeroen Leenars, but using iTerm instead of Terminal.
	Additional contributions to concept (and code) from:

	Felipe Meneguzzi

	-- An iTerm 2 launch script. Opens three terminal windows,
	-- logs them in to three different hosts,
	-- and cd's to a common directory.
	--
	-- Place in ~/Library/Application Support/iTerm/Scripts
	--

	global remoteDirectory
	set remoteDirectory to "/my/project"

	:+1:
	:-1:
	:airplane:
	:art:
	:bear:
	:beer:
	:bike:
	:bomb:
	:book:
	:bulb:

	[merge]
	keepBackup = false
	tool = custom

	[mergetool "custom"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

	'''
	@author Josh Bjornson

	This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
	To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/
	or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
	'''
	# Plugin to provide access to the history of accessed files:
	# https://gist.github.com/1133602
	#