Larry Finger skrev:
> Richard Jonsson wrote:
>> ---
>> Thank you both, but with "git pull" I get this instead:
>>
>> $ git pull
>> Warning: No merge candidate found because value of config option
>> "branch.everything.merge" does not match any remote branch
>> fetched.
>>
>> A google search turned up one relevant result, but it didn't help
>
> Did you do the steps that Linville outlined? I reproduce his notes below:
>
>
> /home/linville/git/wireless-dev
> [linville-t43.mobile]:> git branch
> * master
>
> /home/linville/git/wireless-dev
> [linville-t43.mobile]:> git branch -r
> origin/HEAD
> origin/adm8211
> origin/b43
> origin/everything
> origin/iwlwifi
> origin/mac80211
> origin/master
> origin/merged-upstream
> origin/mm-master
> origin/p54
> origin/rt2x00
> origin/ssb
> origin/zd1211rw
>
> /home/linville/git/wireless-dev
> [linville-t43.mobile]:> git checkout -b everything origin/everything
> Switched to a new branch "everything"
>
> /home/linville/git/wireless-dev
> [linville-t43.mobile]:> git branch
> * everything
> master
>
>
> Is this what you see with a 'git branch' command?
>
> Larry
Yes, that's exactly what I see. Just started over with a fresh tree by
following Linvilles instructions in this topic/thread. I also typed the
additional commands you said, and got the exact same output, reproduced
below:
[EMAIL PROTECTED]:/usr/src/git$ rm -rf wireless-dev/
[EMAIL PROTECTED]:/usr/src/git$ git clone --reference linux-2.6
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
wireless-dev
Initialized empty Git repository in /usr/src/git/wireless-dev/.git/
remote: Generating pack...
remote: Done counting 3229 objects.
remote: Deltifying 3229 objects...
remote: 100% (3229/3229) done
Indexing 3229 objects...
remote: Total 3229 (delta 2651), reused 3098 (delta 2614)
100% (3229/3229) done
Resolving 2651 deltas...
100% (2651/2651) done
Checking 22461 files out...
100% (22461/22461) done
[EMAIL PROTECTED]:/usr/src/git$ cd wireless-dev/
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch
* master
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch -r
origin/HEAD
origin/adm8211
origin/at76
origin/ath5k
origin/b43
origin/everything
origin/iwlwifi
origin/mac80211
origin/master
origin/merged-upstream
origin/mm-master
origin/p54
origin/pending-upstream
origin/rt2x00
origin/ssb
origin/zd1211rw
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git checkout -b
everything origin/everything
Switched to a new branch "everything"
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch
* everything
master
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git pull
Warning: No merge candidate found because value of config option
"branch.everything.merge" does not match any remote branch
fetched.
No changes.
[EMAIL PROTECTED]:/usr/src/git/wireless-dev$
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
