sheldonhull sheldonhull

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

	# There are 3 levels of git config; project, global and system.

	# project: Project configs are only available for the current project and stored in .git/config in the project's directory.
	# global: Global configs are available for all projects for the current user and stored in ~/.gitconfig.
	# system: System configs are available for all the users/projects and stored in /etc/gitconfig.

	# Create a project specific config, you have to execute this under the project's directory.
	$ git config user.name "John Doe"

	# Create a global config

	App configuration in environment variables: for and against

	For (some of these as per the 12 factor principles)

	1) they are are easy to change between deploys without changing any code

	2) unlike config files, there is little chance of them being checked
	into the code repo accidentally

	3) unlike custom config files, or other config mechanisms such as Java

	#.SYNOPSIS
	# Exports objects to an Excel spreadsheet by writing them to a temporary
	# CSV file and using Excel automation model to import it into a workbook.
	# This allows formatting to be applied to columns which would not otherwise
	# be possible in a plain CSV export.
	function Export-Excel {

	[CmdletBinding()]
	param(

	<#
	.Synopsis
	Short description
	.DESCRIPTION
	Long description
	.EXAMPLE
	Example of how to use this cmdlet
	.EXAMPLE
	Another example of how to use this cmdlet
	#>

	# http://stackoverflow.com/questions/5735666/execute-bash-script-from-url
	bash <(curl -s http://mywebsite.com/myscript.txt)

	# http://stackoverflow.com/questions/4642915/passing-parameters-to-bash-when-executing-a-script-fetched-by-curl
	curl http://foo.com/script.sh \| bash -s arg1 arg2

	packer build packer.json 2>&1 \| sudo tee output.txt
	tail -2 output.txt \| head -2 \| awk 'match($0, /ami-.*/) { print substr($0, RSTART, RLENGTH) }' > sudo ami.txt

	[Commands]
	1\Name=Activate and Add to Frequent
	1\Command="
	copyq:
	tab_name = \"Frequent\"

	source = selectedtab()
	tab(source)
	items = selecteditems()
	p = \"application/x-copyq-\"

	Converting md files to html w/highlighting
	0a) Create a root directory to pull in all the repos
	0b) Recursively clone or pull each repo
	$> git clone <repo_url> \| git pull on the existing repos
	0c) Create a TOC index.html file for the root folder
	$> echo '<head>' >> index.html
	$> echo '' >> index.html
	$> echo '</head>' >> index.html
	$> echo '<body>' >> index.html
	$> ls >> temp.html

	.gist
	{
	color: #000;
	}
	.gist .render-container .render-viewer-error,
	.gist .render-container .render-viewer-fatal,
	.gist .render-container .octospinner
	{
	display: none;
	}