Code

Changes between Version 54 and Version 55 of CollaborateOnGithub


Ignore:
Timestamp:
07/10/12 12:16:37 (22 months ago)
Author:
timo
Comment:

Remove spam link

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v54 v55  
    3232(From http://cheat.errtheblog.com/s/git) 
    3333 
    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` 
     34Tell `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` 
    3535{{{ 
    3636git config branch.autosetupmerge true