git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git pull/merge master on other branch

From
LHLars Hjemli <hjemli@gmail.com>
Date
May 13, 2008, 16:08 UTC
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:
Show 6 quoted lines
> 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

Previous: SungHyun NamNext: Brandon Casey
Message 7 of 9 in “git pull/merge master on other branch”
  1. SungHyun NamMay 9, 2008
  2. Johan HerlandMay 9, 2008
  3. SungHyun NamMay 9, 2008
  4. Johan HerlandMay 9, 2008
  5. Kevin BallardMay 9, 2008
  6. SungHyun NamMay 13, 2008
  7. Lars HjemliMay 13, 2008
  8. Brandon CaseyMay 13, 2008
  9. Kelvie WongMay 13, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.