From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 13 May 2008 16:08:42 GMT
Subject: Re: git pull/merge master on other branch
Message-ID: <8c5c35580805130908h4ee12952sc6581d07391ba73e@mail.gmail.com>
In-Reply-To: <4828FB7F.3030907@gmail.com>

On Tue, May 13, 2008 at 4:22 AM, SungHyun Nam <goweol@gmail.com> wrote:
> Kevin Ballard wrote, at 5/10/2008 2:16 AM:
>
>  > 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

I belive that should be `update-ref refs/heads/master origin/master`,
otherwise you'll get this error:

>  It seems it worked, but I see a warning message "refname 'master'
>  is ambiguous." Can I fix this warning message?

Try `rm .git/master`.

--
larsh