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-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 75DA11FB0A for ; Fri, 4 Dec 2020 02:34:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726871AbgLDCcF (ORCPT ); Thu, 3 Dec 2020 21:32:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725984AbgLDCcF (ORCPT ); Thu, 3 Dec 2020 21:32:05 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF533C061A4F for ; Thu, 3 Dec 2020 18:31:18 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id u12so3871080wrt.0 for ; Thu, 03 Dec 2020 18:31:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=YScv3l4E51kKT9CGpPEZVAwD+sbbiQR4f4QPpzG84O4=; b=rIixn3lSzD0QNUp0Jr4b+IdUHGHPJtaJggpnRmpAkqJAm0YCFGIa/ayUTsP4HmJB7l kZ2CiN2GGPUJs1szdZlMYZJkzMEJDjBL7pDNW8JdVOIkMdzHGd+3GhFmMVXmdtGLDXQE vkBxbUbIPstdZl23rH/+5t+KgQA76sfwrj87bqmEetnwWbTeRqtbP71/7P8JFyhKNzkM Z66lFC+mYEBGxECSt4GXQcP8TTKQEUERCXt18JSyQtbuXpSjp/Xy0EjlQWav2krpJWqp YQHoIQXlEG11dBXGrbscJFXpsWhgPHYqT1Iyt3VX0Unq08auTGtqEOYOHHJ3NfBwbrOM Giqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=YScv3l4E51kKT9CGpPEZVAwD+sbbiQR4f4QPpzG84O4=; b=hiwTuzOIrnFoXSnR/bElMT2Ae2BcuL/Lsoz57yg8uI56XMJocpphnudY+Lj74ZINV7 3JFCu4rYBs8ekzjM8k/WUkPv6LdZ978e3fVBEfmK9iRQPRidh0g/BG9TZu2Rxpylk7wn FchlMMjmdW5JrgPZUvyAwKIBywUcCUGH+0oddtIdxpPbRA8NEc77BixFvWWsVVqe0ryX wm1Hnu8e7l4o/pQRsXIjJXraA9HLtbt+Nv+M2/Z6unasrQUxRk57O/XX0t3aJIMGE6Ej uLkJq2OGI2g1rLbgeeqCnoZs7rA7S1wYEwoafczGqTjTJqoED2yyZuyT0LRWbpK8VbxS 4ucQ== X-Gm-Message-State: AOAM533jlAxdSQXnOf3lbu2FoJaEqA2C3OBSk5xIMmgPlBcfRw7FZdw1 AFsJ0MwKvUEdi+HF6QzC6z3USzitbNh5g5jX3t3Pu+WPofCzKA== X-Google-Smtp-Source: ABdhPJxb4wdqto8WiHUZx7hWgUTiZhspqb1cXFmnFX5qSZGOE1cCr0jYYii7NARZFHiPKNcYHRKFe28vfwf7F2Mtdmk= X-Received: by 2002:a5d:4349:: with SMTP id u9mr2150389wrr.319.1607049077715; Thu, 03 Dec 2020 18:31:17 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Felipe Contreras Date: Thu, 3 Dec 2020 20:31:06 -0600 Message-ID: Subject: Re: Unexpected behavior with branch.*.{remote,pushremote,merge} To: Ben Denhartog Cc: Git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Dec 3, 2020 at 7:29 PM Ben Denhartog wrote: > > I have a few repositories on my system that exist primarily as local copi= es of remote repositories, in that I normally just want to track and follow= the upstream project (however, I periodically contribute back upstream so = they are technically forks -- origin is my remote, upstream is theirs). Otherwise known as a triangular workflow, for which in my opinion git doesn't have good support. I wrote about it in my blog [1], and I wrote the patches to properly support that mode [2]. Unfortunately they were not merged. Cheers. [1] https://felipec.wordpress.com/2014/05/11/git-triangular-workflows/ [2] https://lore.kernel.org/git/1398023106-25958-1-git-send-email-felipe.co= ntreras@gmail.com/ --=20 Felipe Contreras