Peter, Could you please try:
git fetch upstream git rebase upstream/master It will do the same thing you are trying to do BR, Alan On Fri, Feb 20, 2026 at 2:31 PM Peter Barada <[email protected]> wrote: > Maarten, thanks for you response but no dice: > > Git remote -v shows: > > peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git remote -v > origin [email protected]:pbarada/nuttx.git (fetch) > origin [email protected]:pbarada/nuttx.git (push) > upstream https://github.com/apache/nuttx.git (fetch) > upstream https://github.com/apache/nuttx.git (push) > > Git complains if I try adding the upstream: > > peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git remote add > upstreamhttps://github.com/apache/nuttx.git > error: remote upstream already exists. > > On 2/20/26 12:24, Maarten Zanders wrote: > > Hi Peter, > > > > Seems like you're missing the remote "upstream". > > I think you missed this step in the guide: > > git remote add upstreamhttps://github.com/apache/nuttx.git > > > > You can list the current remotes with: > > git remote -v > > > > Cheers, > > Maarten > > > > On Fri, Feb 20, 2026 at 5:28 PM Peter Barada<[email protected]> > wrote: > >> I'm working on a PR to add button support tonucleo-h743zi2:jumbo, and > >> am following > >> > https://nuttx.apache.org/docs/latest/contributing/making-changes.html#submitting-your-changes-to-nuttx > >> section to squash my commits but running int trouble on "git checkout > >> upstream" which fails with "error: pathspec 'upstream' did not match any > >> file(s) known to git": > >> > >> peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git status > >> On branch test/nucleo-h743zi2-btns > >> Your branch is up to date with 'origin/test/nucleo-h743zi2-btns'. > >> > >> nothing to commit, working tree clean > >> > >> peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git log | > head > >> commit 8af632480a20079d3adc8dba1e72637471e6db27 > >> Author: Peter Barada<[email protected]> > >> Date: Fri Feb 20 11:18:55 2026 -0500 > >> > >> boards/stm32h7: Fix previous commit to add button support > >> > >> Incorporate PR suggestions to add button support to jumbo > >> configuration selector and update the documentation. > >> > >> Signed-off-by: Peter Barada<[email protected]> > >> > >> peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git > checkout upstream > >> error: pathspec 'upstream' did not match any file(s) known to git > >> > >> peter@legion:~/git/nuttx/github/nucleo-h743zi2-btns/nuttx$ git config > -l > >> core.editor=emacsclient > >> core.pager=cat > >> [email protected] > >> user.name=Peter Barada > >> color.ui=auto > >> core.repositoryformatversion=0 > >> core.filemode=true > >> core.bare=false > >> core.logallrefupdates=true > >> [email protected]:pbarada/nuttx.git > >> remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* > >> branch.master.remote=origin > >> branch.master.merge=refs/heads/master > >> remote.upstream.url=https://github.com/apache/nuttx.git > >> remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/* > >> branch.test/nucleo-h743zi2-btns.remote=origin > >> > branch.test/nucleo-h743zi2-btns.merge=refs/heads/test/nucleo-h743zi2-btns > >> > >> Any idea where I messed up? Thanks in advance! > >> > >> -- > >> Peter Barada > >> [email protected] > > -- > Peter Barada > [email protected] >
