Juan Pablo Contreras Franco jpcofr

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.

Install Homebrew

ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"

Add PATH to ~/.bash_profile and ~/.zshrc

export PATH=/usr/local/bin:$PATH

	ּ_בּ
	בּ_בּ
	טּ_טּ
	כּ‗כּ
	לּ_לּ
	מּ_מּ
	סּ_סּ
	תּ_תּ
	٩(×̯×)۶
	٩(̾●̮̮̃̾•̃̾)۶

	/*
	* switchtemp.c
	*
	* Coded by Stefan Vogt, revised Feb 19, 2011.
	* Released under the FreeBSD license.
	* http://www.byteproject.net
	*
	* template for a switchable command line utility
	*
	*/

	# vi: ft=dosini
	[user]
	name = Pavan Kumar Sunkara
	email = pavan.sss1991@gmail.com
	username = pksunkara
	[core]
	editor = nvim
	whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
	pager = delta
	[column]

	<!doctype html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>App Redirection</title>
	</head>
	<body>
	<!--
	NOTE: This was a great hack in days gone by, but now both Apple and Google have improved their support for custom
	protocol handlers.

	cd repository
	git checkout --orphan orphan_name
	git rm -rf .
	rm '.gitignore'
	echo "#Title of Readme" > README.md
	git add README.md
	git commit -a -m "Initial Commit"
	git push origin orphan_name

	// Start `node d3-server.js`
	// Then visit http://localhost:1337/
	//
	var d3 = require('d3'),
	http = require('http')

	http.createServer(function (req, res) {
	// Chrome automatically sends a requests for favicons
	// Looks like https://code.google.com/p/chromium/issues/detail?id=39402 isn't
	// fixed or this is a regression.

	#Mounting the share is a 2 stage process:
	# 1. Create a directory that will be the mount point
	# 2. Mount the share to that directory

	#Create the mount point:
	mkdir share_name

	#Mount the share:
	mount_smbfs //username:password@server.name/share_name share_name/

	git clean -xfd
	git submodule foreach --recursive git clean -xfd
	git reset --hard
	git submodule foreach --recursive git reset --hard
	git submodule update --init --recursive