Honored Contributor
Honored ContributorThanks Hippo. Unfortunately, I am not sure I understand all of your instructions. I am pretty new to uClinux so you may have to be more explicit on how to perform the steps you described above. I found the vendors/Altera directory under uClinux-dist but I only have a directory of nios2 there. Not sure how to 'switch the the branch to "trunk"'. Sorry to be a bother.
I did this under uClinux-dist: $git branch * test-nios2 $git checkout -b trunk Switched to a new branch 'trunk' $git pull remote: Counting objects: 15, done. remote: Compressing objects: 100% (8/8), done. remote: Total 8 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (8/8), done. From git://sopc.et.ntust.edu.tw/git/uClinux-dist 82a6374..4843bae trunk -> origin/trunk You asked me to pull without telling me which branch you want to merge with, and 'branch.trunk.merge' in your configuration file does not tell me either. Please specify which branch you want to merge on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details. If you often merge with the same branch, you may want to configure the following variables in your configuration file: branch.trunk.remote = <nickname> branch.trunk.merge = <remote-ref> remote.<nickname>.url = <url> remote.<nickname>.fetch = <refspec> See git-config(1) for details. Tim
