From: Felipe Contreras Date: Fri, 04 Dec 2020 02:31:06 GMT Subject: Re: Unexpected behavior with branch.*.{remote,pushremote,merge} Message-ID: In-Reply-To: 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 copies 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.contreras@gmail.com/ -- Felipe Contreras