On Fri, Dec 25, 2020 at 12:13:51AM +0100, Christian Weisgerber wrote:
> Over on freebsd-git@freebsd.org I wrote:
> 
> > Update your source:
> > $ cd /usr/src
>   $ got fetch -a
> > $ got update -b origin/stable/12
> > $ got rebase stable/12
> > 
> > This is the standard configuration which allows you to have changes
> > on a local branch distinct from the upstream origin/* one.
> 
> Something I'm still not clear on: Where do I keep local changes?
> 
> origin/foo and foo are effectively different branches, so I guess
> I can just commit my local changes to foo.
> 
> Alternatively, I can create a local branch mystuff off foo, but then
> updating looks like
>   ...
>   update -b origin/foo
>   rebase foo
>   rebase mystuff
> 
> which seems redundant.
> 
> I can understand keeping foo and mystuff separate if I want to push
> changes on foo, but in a setup where you never push anything?

'refs/heads/' is your playground.
If you never push anything (and don't use mirror mode) names you
choose for local branches don't really matter to anyone but yourself.