Hi, I used to pull using version 1.4.x from Linus tree but with version 1.5.x I can't get it upp and running in the same way. git-pull complains about: 'No merge candidate founde because value of config option" branch.my.merge I tried git-config --add ... with orgin and master but no luck. I also seems to be stuck on version 2.6.21 on my branch. First pull picked up a lot of changes but did no merge it into my tree. What should I do to get git-pull working and at the same time merge the stuff and roll my branch forward to the latest version? git-pull -> Warns about merge candidate git-pull . master -> Says up to date git-status -> Only list 3 files not commited due to changes I did. /Pelle - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
