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

Re: What's cooking in git.git (Nov 2010, #03; Wed, 24)

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Nov 25, 2010, 09:45 UTC
Message-ID
<AANLkTi=U=Km28W-xUM0vmRhhYCuhjSxxk5Fk_yhvjz8K@mail.gmail.com>
In-Reply-To
<7vk4k2rt2m.fsf@alter.siamese.dyndns.org>
On Thu, Nov 25, 2010 at 04:16, Junio C Hamano <gitster@pobox.com> wrote:
> It is getting ridiculously painful to keep re-resolving the conflicts with
> other topics in flight, even with the help with rerere.
>
> Needs a bit more minor work to get the basic code structure right.

Still waiting on input about what exactly needs to be fixed. See <AANLkTikw0+FGJmj7C0B9J_3ZVXrbqCw+UzyP3sqfyVdm@mail.gmail.com.

Is there anything else than that (the builtin.h includes) that you think needs work?

Previous: Jiang XinNext: Erik Faye-Lund
Message 3 of 23 in “What's cooking in git.git (Nov 2010, #03; Wed, 24)”
  1. Junio C HamanoNov 25, 2010
  2. Jiang XinNov 25, 2010
  3. Ævar Arnfjörð BjarmasonNov 25, 2010
  4. Erik Faye-LundNov 25, 2010
  5. Ævar Arnfjörð BjarmasonNov 25, 2010
  6. Erik Faye-LundNov 25, 2010
  7. Erik Faye-LundNov 25, 2010
  8. Erik Faye-LundNov 25, 2010
  9. Erik Faye-LundNov 25, 2010
  10. Ævar Arnfjörð BjarmasonNov 25, 2010
  11. Erik Faye-LundNov 25, 2010
  12. Ævar Arnfjörð BjarmasonNov 25, 2010
  13. Erik Faye-LundNov 25, 2010
  14. Ævar Arnfjörð BjarmasonNov 26, 2010
  15. Johannes SixtNov 25, 2010
  16. Jakub NarebskiNov 25, 2010
  17. Thomas RastDec 3, 2010
  18. Jakub NarebskiDec 3, 2010
  19. Thomas RastDec 3, 2010
  20. Jakub NarebskiDec 3, 2010
  21. Thomas RastDec 3, 2010
  22. Jakub NarebskiDec 3, 2010
  23. Thomas RastDec 3, 2010

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.