From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Philip Oakley <philipoakley@iee.email>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
phillip.wood@dunelm.org.uk, Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git branch --edit-description a custom file
Date: Mon, 04 Nov 2019 12:21:52 +0900 [thread overview]
Message-ID: <xmqqd0e81g33.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191031154217.GA30187@sigill.intra.peff.net> (Jeff King's message of "Thu, 31 Oct 2019 11:42:17 -0400")
Jeff King <peff@peff.net> writes:
> Do either of you use remote.pushDefault, branch.*.pushRemote, or
> @{push}?
>
> My triangular config for git.git looks like:
>
> [remote "origin"]
> url = https://github.com/gitster/git.git
> [remote "github"]
> url = https://github.com/peff/git.git
> [remote]
> pushDefault = github
> [branch "jk/foo"]
> remote = origin
> merge = refs/heads/master
>
> Then upstream comparisons, "git rebase" etc without arguments, do what I
> want: compare against master. And "git push" without arguments does what
> I want: push this branch to my fork. And if I need to refer to the
> pushed version for some reason (e.g., comparing what I just changed to
> what I last sent out, "git range-diff @{u} @{push} HEAD" does the right
> thing.
Yeah, I do recall we had quite a lot of design discussions around
"triangular" workflow when we introduced these facilities, and if I
am not mistaken, the above is the way they are designed to be used.
Thanks for an example.
next prev parent reply other threads:[~2019-11-04 3:21 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
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 [this message]
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=xmqqd0e81g33.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--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).