Changes between Version 43 and Version 44 of CollaborateOnGithub
- Timestamp:
- Aug 9, 2011, 3:25:03 AM (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
CollaborateOnGithub
v43 v44 38 38 (From http://cheat.errtheblog.com/s/git) 39 39 40 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`40 Tell `git branch` and `git checkout` to setup new branches so that `git pull` will [http://www.diamondlinks.net/ link building] 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` 41 41 {{{ 42 42 git config branch.autosetupmerge true … … 81 81 === Working on a task === 82 82 83 '''Goal''': keep the changes self-contained, create and update patches suitable for attaching to [http://code.djangoproject.com/simpleticket tickets in Django trac].83 '''Goal''': keep the changes self-contained, create and update patches suitable for [http://www.truckaccidentlawyersource.com/ truck accident lawyer] attaching to [http://code.djangoproject.com/simpleticket tickets in Django trac]. 84 84 85 85 1. Create a branch from master