Re: [PATCH 2/2] format-patch: introduce format.defaultTo

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Jan 7, 2014, 16:47 UTC
Message-ID: <CALkWK0=VT_MaLJKzhRyrEjG_PH=rEGiMuyHeuEXpSqgeVLqjuA@mail.gmail.com>
In-Reply-To: <CAEBDL5W+3zRb1c51N2JfTR2acwvrUi8TpOw-DkjUn_r114mhAA@mail.gmail.com>

John Szakmeister wrote:

Show 5 quoted lines

> I guess it's not a good idea to
> set 'push.default' to 'upstream' in this triangle workflow then,
> otherwise the branch name being pushed to will be 'branch.*.merge'.
> Is that correct?  I just want to make sure I understand what's
> happening here.

push.default = upstream does not support triangular workflows. See builtin/push.c:setup_push_upstream().

> Given this new found knowledge, I'm not sure it makes sense for `git
> status` to show me the status against the upstream vs. the publish
> location.  The latter makes a little more sense to me, though I see
> the usefulness of either one.

Currently, status information is only against @{u}; we haven't invented a @{publish} yet.