Shan Shaji shan-shaji

Git Subtree Basics

If you hate git submodule, then you may want to give git subtree a try.

Background

When you want to use a subtree, you add the subtree to an existing repository where the subtree is a reference to another repository url and branch/tag. This add command adds all the code and files into the main repository locally; it's not just a reference to a remote repo.

When you stage and commit files for the main repo, it will add all of the remote files in the same operation. The subtree checkout will pull all the files in one pass, so there is no need to try and connect to another repo to get the portion of subtree files, because they were already included in the main repo.

Adding a subtree

Let's say you already have a git repository with at least one commit. You can add another repository into this respository like this:

If you are like me you find yourself cloning a repo, making some proposed changes and then deciding to later contributing back using the GitHub Flow convention. Below is a set of instructions I've developed for myself on how to deal with this scenario and an explanation of why it matters based on jagregory's gist.

To follow GitHub flow you should really have created a fork initially as a public representation of the forked repository and the clone that instead. My understanding is that the typical setup would have your local repository pointing to your fork as origin and the original forked repository as upstream so that you can use these keywords in other git commands.

Clone some repo (you've probably already done this step).
```
git clone [email protected]
```

ANSI Escape Sequences

Standard escape codes are prefixed with Escape:

Ctrl-Key: ^[
Octal: \033
Unicode: \u001b
Hexadecimal: \x1B
Decimal: 27

How To Work With Multiple Github Accounts on a single Machine

Let suppose I have two github accounts, https://github.com/rahul-office and https://github.com/rahul-personal. Now i want to setup my mac to easily talk to both the github accounts.

NOTE: This logic can be extended to more than two accounts also. :)

The setup can be done in 5 easy steps:

Steps:

Step 1 : Create SSH keys for all accounts
Step 2 : Add SSH keys to SSH Agent

	" cat

	lac 017777 i " Load accumulator (AC) with argument count
	sad d4 " Skip next if we have more than 4 words of args
	jmp nofiles " Otherwise, jump to nofiles
	lac 017777 " Load AC with address of args
	tad d1 " Increment AC by 1, past argument count
	tad d4 " Increment AC by 4, now AC points to first real arg
	dac name " Save arg pointer from AC into 'name'

	'use strict';

	const DEF_CURRENCY = 'USD';
	const DEF_SCALE_FACTOR = 100;

	const mongoose = require('mongoose');
	const Schema = mongoose.Schema;
	const ObjectId = Schema.ObjectId;

	const MoneySchema = new Schema({