Changes between Version 54 and Version 55 of CollaborateOnGithub
- Timestamp:
- Jul 10, 2012, 2:16:37 PM (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
CollaborateOnGithub
v54 v55 32 32 (From http://cheat.errtheblog.com/s/git) 33 33 34 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`34 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` 35 35 {{{ 36 36 git config branch.autosetupmerge true