Re: Problem with wireless-2.6

[Pavel Roskin <proski@gnu.org>]

Hello, Larry!

On Mon, 2007-11-05 at 11:49 -0600, Larry Finger wrote:
> John,
> 
> I did the following set of steps:
> 
> git clone --reference ~/linux-2.6 \
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git junk
> 
> cd junk
> git checkout -b everything origin/everything
> git pull
> Warning: No merge candidate found because value of config option
>          "branch.everything.merge" does not match any remote branch fetched.
> No changes.

Just add "--track" to the git-checkout command, and it will be fine:

[proski@dv junk]$ git checkout --track -b everything origin/everything
Branch everything set up to track remote branch refs/remotes/origin/everything.
Switched to a new branch "everything"
[proski@dv junk]$ git-pull
Already up-to-date.
[proski@dv junk]$

Or better yet, add this to ~/.gitconfig:

[branch]
        autosetupmerge = true

This would be equivalent to using "--track" by default.  Please make
sure you have a recent version of git, as --track appeared first in
git-1.5.1.

-- 
Regards,
Pavel Roskin