Matthieu Moy [off-list ref] writes:
Just to be clear: I'm not saying that your workflow is wrong, but my
feeling is that you wouldn't be hurt by 'push.default=upstream'. The
area of potential improvement for your case would be at branch creation
time more than at push time.
Your analysis of Stefan's pain points sounds very sensible.
The autoSetupMerge mechanism may want to learn new tricks, but that
is a separate issue and it shouldn't affect the search for a sane
default for push.