In the Org FAQ, under the "How can I keep local changes..." section, there's a note saying that the config local:rebase options are no longer needed under the new make system, and something equivalent can be done using local.mk configurations.
I'm not terribly conversant with Makefiles, but is the following correct? Given that I have a local branch called "local", and like "up1" as my standard make target, my understanding is that "make myup" will perform the up1 installation, then execute my rebase command. --8<---------------cut here---------------start------------->8--- oldorg: up1 # Update from git, build, check, but don't install up1 myup:: git rebase master local --8<---------------cut here---------------end--------------->8--- If this is right, maybe we can add an extra line or two of explanation to the FAQ? Thanks, Eric