From: Kevin Ballard <kevin@sb.org>
Date: Fri, 09 May 2008 17:16:04 GMT
Subject: Re: git pull/merge master on other branch
Message-ID: <8C649BDA-41CA-4105-86C5-103B4A8BEEC1@sb.org>
In-Reply-To: <200805090824.12772.johan@herland.net>

On May 9, 2008, at 1:24 AM, Johan Herland wrote:

> On Friday 09 May 2008, SungHyun Nam wrote:
>> Hello,
>>
>> If I am on a branch (reguarly rebased), I don't want to switch to
>> master branch, but merge origin into master.
>> If I switch to master and pull and switch to branch, I have to
>> rebuild almost of sources.
>>
>> How I can pull origin into master without switching to master
>> branch?
>
> You can't; merging requires use of the working tree (to resolve  
> conflicts).
>
> However, what you can do is make a local clone of your project (cheap,
> because it just hardlinks files from the original repo), and  
> checkout the
> master branch in the clone, perform the merge (after having set up  
> the same
> origin and retrieved its contents), and then fetch (or push) the  
> result back
> into the original repo (remember: "fetch" instead of "pull", since the
> latter will initiate a merge with your current branch).


If you know the pull will just be a fast-foward, then you can do  
something like

   git fetch origin && git update-ref master origin/master

-Kevin Ballard

-- 
Kevin Ballard
http://kevin.sb.org
kevin@sb.org
http://www.tildesoft.com