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

Re: [PATCH v2 0/6] Support triangular workflows

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 22, 2013, 15:16 UTC
Message-ID
<7v7gkz8nyf.fsf@alter.siamese.dyndns.org>
In-Reply-To
<26A2BE0824FE4C999592D392FCBEF988@PhilipOakley>
"Philip Oakley" <philipoakley@iee.org> writes:
> Shouldn't Documentation/gitworkflows.txt also be updated with the
> triangular workflow and its configuration?

What is missing from gitworkflows documentation is actually a non-triangular workflow, where people pull from and push into the same central repository.

The "merge workflow" part in the "distributed workflows" section teaches:

 * fetching others' work from <remote> and merging it to yours;
 * publishing your work to <remote>; and
 * advertising your work.
and it is written for the triangular workflow.

Two triangles are involved. The maintainer may pull from you but pushes to her own, which is one triangle, and you pull from the maintainer and push to your own, which is another.

As to your suggestion, I do think it is reasonable to clarify these triangles with an illustration, and to even add descriptions for short-cut configurations as a side note.

Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 32 of 33 in “Support triangular workflows”
  1. 0/6 Support triangular workflowsRamkumar Ramachandra, Mar 20, 2013
  2. 1/6 remote.c: simplify a bit of code using git_config_string()Ramkumar Ramachandra, Mar 20, 2013
  3. Jonathan NiederMar 20, 2013
  4. Ramkumar RamachandraMar 20, 2013
  5. 2/6 t5516 (fetch-push): update test descriptionRamkumar Ramachandra, Mar 20, 2013
  6. Jonathan NiederMar 20, 2013
  7. Ramkumar RamachandraMar 20, 2013
  8. Jonathan NiederMar 20, 2013
  9. 3/6 t5516 (fetch-push): introduce mk_test_with_name()Ramkumar Ramachandra, Mar 20, 2013
  10. Jonathan NiederMar 20, 2013
  11. Ramkumar RamachandraMar 20, 2013
  12. Jonathan NiederMar 20, 2013
  13. Jeff KingMar 20, 2013
  14. Junio C HamanoMar 20, 2013
  15. Jonathan NiederMar 20, 2013
  16. 4/6 remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra, Mar 20, 2013
  17. Jonathan NiederMar 20, 2013
  18. Junio C HamanoMar 20, 2013
  19. Ramkumar RamachandraMar 20, 2013
  20. Junio C HamanoMar 20, 2013
  21. 5/6 remote.c: introduce remote.pushdefaultRamkumar Ramachandra, Mar 20, 2013
  22. Jonathan NiederMar 20, 2013
  23. Junio C HamanoMar 20, 2013
  24. Ramkumar RamachandraMar 20, 2013
  25. 6/6 remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra, Mar 20, 2013
  26. Tay Ray ChuanMar 20, 2013
  27. Ramkumar RamachandraMar 20, 2013
  28. Tay Ray ChuanMar 20, 2013
  29. Ramkumar RamachandraMar 22, 2013
  30. Philip OakleyMar 20, 2013
  31. Ramkumar RamachandraMar 22, 2013
  32. Junio C HamanoMar 22, 2013
  33. Ramkumar RamachandraMar 23, 2013

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.