On 2022.04.20 07:12, Tao Klerks wrote: > On Mon, Apr 18, 2022 at 8:15 PM Josh Steadmon <steadmon@xxxxxxxxxx> wrote: > > It seems appropriate to me to add one, > > perhaps at the point where a user with "autosetupmerge=true" would run > > into a failure when trying to push? > > Having thought about this a bit, I agree. On the one hand I'm a little > nervous about adding this kind of public behavior change as I would > imagine it's more likely to encounter resistance here, on the other > hand I do think it will make the changes themselves much more useful. > Also, this patchset hasn't moved in a while, so "holding it up" with > new changes may not be a significant concern. > > the current advice looks something like: > --- > fatal: The upstream branch of your current branch does not match > the name of your current branch. To push to the upstream branch > on the remote, use > > git push origin HEAD:master > > To push to the branch of the same name on the remote, use > > git push origin HEAD > > To choose either option permanently, see push.default in 'git help config'. > --- > > I would propose to add one sentence at the end along the lines of: > --- > To instead avoid automatically configuring upstream branches when > their name doesn't match the local branch, see option 'simple' of > branch.autosetupmerge in 'git help config'. > --- > > Does that make sense to you? Sounds good to me.
