Code

Changes between Version 49 and Version 50 of CollaborateOnGithub


Ignore:
Timestamp:
02/22/12 22:09:21 (2 years ago)
Author:
yieldyki
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v49 v50  
    3030(From http://cheat.errtheblog.com/s/git) 
    3131 
    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` 
     32Tell `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` 
    3333{{{ 
    3434git config branch.autosetupmerge true