From: Keith Duthie Date: Thu, 07 Jun 2007 19:12:14 GMT Subject: Re: pull/merge --no-commit Message-ID: In-Reply-To: <46684EFD.1080804@alcatel-lucent.com> On Thu, 7 Jun 2007, kurt_p_lloyd wrote: > Except here's the model that I am trying to follow.... > It seems that 'pull' can be partitioned into 3 separate responsibilities: > > 1. Retrieve changes from the remote user's replica (without modifying > any /local/ branches). > 2. Bring changes from "remote" into a local branch (without commit). > 3. Commit. I believe you can accomplish step one with a remote tracking branch ("git-remote add localname git://whereever/project.git" to add the branch to the repository, then "git-remote update localname" to update it to the current remote state). -- The universe hates you, but don't worry - it's nothing personal.