On Sun, Jul 19 2026, "Tom Rini" <[email protected]> wrote:
> On Wed, Jul 08, 2026 at 10:19:45AM -0600, Tom Rini wrote: > >> Hey all, >> >> As part of migrating from source.denx.de and over to >> git.u-boot-project.org, I think it's time to change the branching scheme >> from master or next to main or next. Since we'll be changing the URLs, I >> don't think we need to (and I'm not sure we can automatically) have a >> period where both exist. Thanks! > > This is now in effect. The "main" branch on > https://git.u-boot-project.org/u-boot/u-boot is up to date, and the > "master" branch (per Marek's suggestion) is on v2026.07. The GitHub, > Gitlab.com and also source.denx.de repositories match this. Tip: If, like me, you are heavily relying on tab-completion, you will now experience that git log up<TAB>m<TAB> no longer tab-completes to upstream/master, nor, as it now should, upstream/main, because both exist, so it only ends up showing "upstream/ma". You can easily configure git to ignore the "master" branch on the upstream remote. First, delete the current remote-tracking branch: git branch --remote --delete upstream/master Then in your repository's .git/config, make sure the remote.upstream section is something like [remote "upstream"] url = https://git.u-boot-project.org/u-boot/u-boot.git fetch = +refs/heads/*:refs/remotes/upstream/* fetch = ^refs/heads/master i.e. add the negative refspec '^refs/heads/master'. Then "git remote update", "git fetch upstream" and similar won't create that remote-tracking branch again. (Of course, replace "upstream" by "origin" or whatever your remote name is for the upstream repository.) Rasmus
