From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 86D2F1F454 for ; Sun, 3 Nov 2019 17:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727967AbfKCR4H (ORCPT ); Sun, 3 Nov 2019 12:56:07 -0500 Received: from smtp.hosts.co.uk ([85.233.160.19]:15844 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727758AbfKCR4H (ORCPT ); Sun, 3 Nov 2019 12:56:07 -0500 Received: from [92.30.121.54] (helo=[192.168.1.22]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1iRK6e-0001wr-7D; Sun, 03 Nov 2019 17:56:04 +0000 Subject: Re: git branch --edit-description a custom file To: Jeff King Cc: Johannes Schindelin , phillip.wood@dunelm.org.uk, Denton Liu , Git Mailing List References: <20191030183950.GA21277@generichostname> <20191030202835.GB29013@sigill.intra.peff.net> <20191030224328.GB44961@generichostname> <20191031061832.GA20830@sigill.intra.peff.net> <8b9021fa-f60c-a2e0-1174-a2fc1f11c476@gmail.com> <9aa1cefc-daeb-e702-95ba-1e83f8f7dcfe@iee.email> <20191031154217.GA30187@sigill.intra.peff.net> From: Philip Oakley Message-ID: <49625b39-61dc-f702-eeba-9bdec60a42d1@iee.email> Date: Sun, 3 Nov 2019 17:56:04 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191031154217.GA30187@sigill.intra.peff.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Peff, On 31/10/2019 15:42, Jeff King wrote: > On Thu, Oct 31, 2019 at 01:45:31PM +0000, Philip Oakley wrote: > >> 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. > Do either of you use remote.pushDefault, branch.*.pushRemote, or > @{push}? I haven't been using those configs, and was only vaguely aware of them and what, if anything, they did (inc how to set them up _systematically_) > > 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 I had recently seen your <20190731055832.GA18039@sigill.intra.peff.net> (Wed, 31 Jul 2019 01:58:33 -0400) which mentioned your setting. > > 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. I am trying to write myself some 'user' based notes covering the publish-backup-collaborate-upstream viewpoints of the different repo settings as the config pages rarely give that viewpoint (hence my bad setup). There's also still the 'triangle' workflow to clarify - does it refer to patch based flow, or to a three-way repo config? I suspect there are more configs that need setting up for a proper stable user experience (e.g. the merge setting of '--ff-only' when the local branch "--follow"s the upstream but should never have local changes). -- Philip