From: "Lars Hjemli" <hjemli@gmail.com>
To: "SungHyun Nam" <goweol@gmail.com>
Cc: git@vger.kernel.org, "Kevin Ballard" <kevin@sb.org>,
"Johan Herland" <johan@herland.net>
Subject: Re: git pull/merge master on other branch
Date: Tue, 13 May 2008 18:08:42 +0200 [thread overview]
Message-ID: <8c5c35580805130908h4ee12952sc6581d07391ba73e@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2008-05-13 16:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-09 5:26 git pull/merge master on other branch SungHyun Nam
2008-05-09 6:24 ` Johan Herland
2008-05-09 8:28 ` SungHyun Nam
2008-05-09 9:06 ` Johan Herland
2008-05-09 17:16 ` Kevin Ballard
2008-05-13 2:22 ` SungHyun Nam
2008-05-13 16:08 ` Lars Hjemli [this message]
2008-05-13 17:24 ` Brandon Casey
2008-05-13 3:12 ` Kelvie Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c5c35580805130908h4ee12952sc6581d07391ba73e@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=goweol@gmail.com \
--cc=johan@herland.net \
--cc=kevin@sb.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).