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 _______________________________________________ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
