On Thu, 01 Mar 2012 17:16:59 -0500, Jonathan M Davis wrote: > > If you make changes in a branch and want them on top of what's in > master, then do > > git-rebase master
While "git-rebase" may be available on your system, I think the typical spelling would be git rebase master Graham > in _the branch_ and then merge the branch into master. And if you're > using github to do pull requests and the like, then don't merge into > master all. Simply create the pull request from the branch. That way, > master only ever gets updated when the main repository gets updated, and > you always have a clean version which matches the main repository. > > - Jonathan M Davis
