Context Navigation

Changes between Version 49 and Version 50 of CollaborateOnGithub

v49	v50
30	30	(From http://cheat.errtheblog.com/s/git)
31	31
32		Tell `git branch` and `git checkout` to setup new branches so that `git pull` will appropriately merge from that remote branch. Without this, you will have to add `--track` to your branch command or manually merge remote tracking branches with `fetch` and then `merge`
	32	Tell `git branch` and `git checkout` to setup new branches so that `git pull` will appropriately merge from that [http://www.kineticfountains.com/water-walls.asp Water Walls] remote branch. Without this, you will have to add `--track` to your branch command or manually merge remote tracking branches with `fetch` and then `merge`
33	33	{{{
34	34	git config branch.autosetupmerge true