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

From: John Szakmeister <john@szakmeister.net>
Date: Jan 6, 2014, 21:13 UTC
Message-ID: <CAEBDL5VD9C8DXFUS9VawxZhAC0AnR=abV-FEVTdi25NVBPvDVg@mail.gmail.com>
In-Reply-To: <20140106204203.GI3881@google.com>

On Mon, Jan 6, 2014 at 3:42 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 13 quoted lines

> John Szakmeister wrote:
>
>>                                                        I think in a
>> typical, feature branch-based workflow @{u} would be nearly useless.
>
> I thought the idea of @{u} was that it represents which ref one
> typically wants to compare the current branch to.  It is used by
> 'git branch -v' to show how far ahead or behind a branch is and
> used by 'git pull --rebase' to forward-port a branch, for example.
>
> So a topic branch with @{u} pointing to 'master' or 'origin/master'
> seems pretty normal and hopefully the shortcuts it allows can make
> life more convenient.

Is there an outline of this git workflow in the documentation somewhere? Do you save your work in a forked repo anywhere? If so, how do you typically save your work. I typically have my @{u} pointing to where I save my work. Perhaps I'm missing something important here, but I don't feel like the current command set and typical workflow (at least those in tutorials) leads you in that direction.

Here is one example:
   <https://www.atlassian.com/git/workflows#!workflow-feature-branch>

> It is *not* primarily about where the branch gets pushed.  After all,
> in both the 'matching' and the 'simple' mode, "git push" does not push
> the current branch to its upstream @{u} unless @{u} happens to have
> the same name.

Then where does it get pushed?  Do you always specify where to save your work?

FWIW, I think the idea of treating @{u} as the eventual recipient of your changes is good, but then it seems like Git is lacking the "publish my changes to this other branch" concept.

Am I missing something? If there is something other than @{u} to represent this latter concept, I think `git push` should default to that instead. But, at least with my current knowledge, that doesn't exist--without explicitly saying so--or treating @{u} as that branch. If there's a better way to do this, I'd love to hear it!

Thanks!

-John