All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Wink Saville <wink@saville.com>
Cc: git@vger.kernel.org
Subject: Re: Git branching & pulling
Date: Sat, 19 May 2007 01:49:36 -0400	[thread overview]
Message-ID: <20070519054936.GC2679@fieldses.org> (raw)
In-Reply-To: <d4cf37a60705182240s414243a6wae69d26f70f64dd5@mail.gmail.com>

On Fri, May 18, 2007 at 10:40:17PM -0700, Wink Saville wrote:
> Hello,
> 
> I'm having trouble understanding branching and pull.
> 
> Using git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> I can create a branch off the master and do a pull:
> 
> wink@ic2d1:~/linux/linux-2.6$ git-checkout master
> Switched to branch "master"
> wink@ic2d1:~/linux/linux-2.6$ git-checkout -b test
> Switched to a new branch "test"
> wink@ic2d1:~/linux/linux-2.6$ git-pull
> Already up-to-date.
> 
> 
> 
> But from some reason using
> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
> the following happens
> 
> wink@ic2d1:~/linux/kvm-linux-2.6$ git-checkout master
> Already on branch "master"
> wink@ic2d1:~/linux/kvm-linux-2.6$ git-checkout -b test
> Switched to a new branch "test"
> wink@ic2d1:~/linux/kvm-linux-2.6$ git-pull
> Warning: No merge candidate found because value of config option
>         "branch.test.merge" does not match any remote branch fetched.
> No changes.

The differences you describe are almost certainly due to differences in
the git version, not the cloned repository.  Are you sure git wasn't
ugpraded between the two tests?

--b.

  reply	other threads:[~2007-05-19  5:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-19  5:40 Git branching & pulling Wink Saville
2007-05-19  5:49 ` J. Bruce Fields [this message]
2007-05-19  6:00 ` Junio C Hamano
2007-05-19  6:05   ` Junio C Hamano
2007-05-19  6:22     ` Steven Grimm
2007-05-19  6:28       ` Junio C Hamano
2007-05-19 16:31         ` Wink Saville
2007-05-20 20:30           ` Josef Weidendorfer
2007-05-23  0:22             ` Wink Saville
2007-05-23  0:35               ` Junio C Hamano
2007-05-23  5:07                 ` [PATCH] Document branch.autosetupmerge Paolo Bonzini
2007-05-23  9:49                 ` Git branching & pulling Josef Weidendorfer

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=20070519054936.GC2679@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=wink@saville.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.