From: Philip Oakley <philipoakley@iee.email>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
phillip.wood@dunelm.org.uk
Cc: Jeff King <peff@peff.net>, Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git branch --edit-description a custom file
Date: Thu, 31 Oct 2019 13:45:31 +0000 [thread overview]
Message-ID: <9aa1cefc-daeb-e702-95ba-1e83f8f7dcfe@iee.email> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1910311229150.46@tvgsbejvaqbjf.bet>
Hi,
On 31/10/2019 11:30, Johannes Schindelin wrote:
> And while we're dreaming: it would be nice to discern between "push
> upstreams" and "base upstreams". Example: when I work on the
> `fix-t5516-flakiness` branch, I target `upstream/master`, but I push to
> `dscho`, i.e. my "push upstream" is `dscho/fix-t5516-flakiness`.
>
> Ciao,
> Dscho
Yep, the triangular workflow of 'publish' v 'upstream' v 'local' is
quite tricky. There is little user facing docs for that.
Many of my branches have the wrong "upstream" in the sense that it's the
push-publish remote that holds copies of my work (i.e. I manually select
the push-remote every time;-), even though the branches are set to track
the original start point's upstream.
Philip
next prev parent reply other threads:[~2019-10-31 13:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 18:39 git branch --edit-description a custom file Denton Liu
2019-10-30 20:28 ` Jeff King
2019-10-30 22:43 ` Denton Liu
2019-10-31 6:18 ` Jeff King
2019-10-31 10:22 ` Johannes Schindelin
2019-10-31 11:00 ` Phillip Wood
2019-10-31 11:30 ` Johannes Schindelin
2019-10-31 13:45 ` Philip Oakley [this message]
2019-10-31 15:42 ` Jeff King
2019-11-03 17:56 ` Philip Oakley
2019-11-04 19:50 ` Jeff King
2019-11-04 3:21 ` Junio C Hamano
2019-10-31 18:19 ` Denton Liu
2019-10-31 19:53 ` Phillip Wood
2019-10-31 20:07 ` Jeff King
2019-11-01 12:29 ` Phillip Wood
2019-11-01 16:49 ` Jeff King
2019-11-01 20:35 ` Phillip Wood
2019-11-02 4:53 ` Junio C Hamano
2019-10-31 17:35 ` Denton Liu
2019-10-31 18:06 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9aa1cefc-daeb-e702-95ba-1e83f8f7dcfe@iee.email \
--to=philipoakley@iee.email \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).