Dread Knight DreadKnight

Make push/pull work with a remote non-bare repository

Sometimes it is necessary (and desireable) to work on a git repository on multiple development machines. We want to be able to push and pull between repositories without having to use an intermediary bare repository, and for this to work symetrically in both repositories.

First clone we clone an existing repository:

git clone ssh://user@hostname:/path/to/repo

By default this will name the remote as origin, but let's assume we want to reserve that name for a master repository that commits will eventually get pushed to:

Let's say you have an iOS project, and you want to use some external library, like AFNetworking. How do you integrate it?

With submodules

Add the project to your repo:

git submodule add [email protected]:AFNetworking/AFNetworking.git Vendor/AFNetworking

or something to that effect.

Each of these commands will run an ad hoc http static server in your current (or specified) directory, available at http://localhost:8000. Use this power wisely.

Discussion on reddit.

Python 2.x

$ python -m SimpleHTTPServer 8000

Git Submodules basic explanation

Why submodules?

In Git you can add a submodule to a repository. This is basically a repository embedded in your main repository. This can be very useful. A couple of usecases of submodules:

Separate big codebases into multiple repositories.

Source: http://willandorla.com/will/2011/01/convert-folder-into-git-submodule/

1. Clone new repository

$ git clone --no-hardlinks original-repo copied-repo

	var canvasElem = document.getElementById("game");
	var world = boxbox.createWorld(canvasElem);

	world.createEntity({
	name: "player",
	shape: "circle",
	radius: 1,
	image: "pig.png",
	imageStretchToFit: true,
	density: 4,

	convert favicon.png -resize 16x16 favicon.ico;
	convert favicon.png -resize 16x16 favicon_16x16.png;
	convert favicon.png -resize 32x32 favicon_32x32.png;
	convert favicon.png -resize 64x64 favicon_64x64.png;
	convert favicon.png -resize 128x128 favicon_128x128.png;
	echo "conversion complete";

	// sign up
	account.signUp('[email protected]', 'secret');

	// sign in
	account.signIn('[email protected]', 'secret');

	// sign in via oauth
	account.signInWith('twitter');

	// sign out

	node_modules/
	fixtures/
	output/
	config.json

	function listButtons(gamepad) {
	for (var i = 0; i < gamepad.buttons.length; i++) {
	var b = gamepad.buttons[i];
	var pressed, val;
	if (typeof(b) == "object") {
	pressed = b.pressed;
	val = b.value;
	} else {
	val = b;
	pressed = b == 1.0;