git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Unexpected behavior with branch.*.{remote,pushremote,merge}

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Dec 4, 2020, 02:31 UTC
Message-ID
<CAMP44s2=3GrXf69jqVJ23U=N9QcmGb-dHP_OEqyb6MVTY2z7Jg@mail.gmail.com>
In-Reply-To
<a4ae4e1a-b457-4b35-878c-2714ebfc415f@www.fastmail.com>
On Thu, Dec 3, 2020 at 7:29 PM Ben Denhartog <ben@sudoforge.com> 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
Previous: Ben DenhartogNext: Ben Denhartog
Message 2 of 9 in “Unexpected behavior with branch.*.{remote,pushremote,merge}”
  1. Ben DenhartogDec 4, 2020
  2. Felipe ContrerasDec 4, 2020
  3. Ben DenhartogDec 4, 2020
  4. Felipe ContrerasDec 4, 2020
  5. Jeff KingDec 4, 2020
  6. Ben DenhartogDec 4, 2020
  7. Junio C HamanoDec 4, 2020
  8. Jeff KingDec 4, 2020
  9. Ben DenhartogDec 4, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.