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

Re: [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 30, 2013, 03:34 UTC
Message-ID
<7vsj5jmjie.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7vwquvmkon.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> Heh, I actually was hoping that you will send in a replacement for
> David's patch ;-)
>
> Here is what I will squash into the one we have been discussing.  In
> a few hours, I expect I'll be able to push this out in the 'pu'
> branch.

I ended up doing this a bit differently; will push out the result after merging the other topics to 'pu'.

Previous: Junio C HamanoNext: John Keeping
Message 15 of 36 in “Auto-generate mergetool lists”
  1. 0/4 Auto-generate mergetool listsDavid Aguilar, Jan 28, 2013
  2. 1/4 mergetool--lib: Simplify command expressionsDavid Aguilar, Jan 28, 2013
  3. 2/4 mergetool--lib: Improve the help text in guess_merge_tool()David Aguilar, Jan 28, 2013
  4. 3/4 mergetool--lib: Add functions for finding available toolsDavid Aguilar, Jan 28, 2013
  5. 4/4 doc: Generate a list of valid merge toolsDavid Aguilar, Jan 28, 2013
  6. Junio C HamanoJan 28, 2013
  7. John KeepingJan 28, 2013
  8. Junio C HamanoJan 28, 2013
  9. John KeepingJan 29, 2013
  10. Junio C HamanoJan 29, 2013
  11. David AguilarJan 29, 2013
  12. Junio C HamanoJan 29, 2013
  13. John KeepingJan 29, 2013
  14. Junio C HamanoJan 30, 2013
  15. Junio C HamanoJan 30, 2013
  16. John KeepingJan 29, 2013
  17. John KeepingJan 29, 2013
  18. David AguilarJan 29, 2013
  19. Junio C HamanoJan 29, 2013
  20. 1/4 mergetool--lib: simplify command expressionsDavid Aguilar, Jan 30, 2013
  21. Junio C HamanoJan 30, 2013
  22. Junio C HamanoJan 28, 2013
  23. David AguilarJan 28, 2013
  24. Junio C HamanoJan 28, 2013
  25. David AguilarJan 28, 2013
  26. Junio C HamanoJan 28, 2013
  27. John KeepingJan 28, 2013
  28. Junio C HamanoJan 28, 2013
  29. John KeepingJan 28, 2013
  30. Joachim SchmitzJan 29, 2013
  31. John KeepingJan 29, 2013
  32. Junio C HamanoJan 29, 2013
  33. John KeepingJan 29, 2013
  34. Philip OakleyJan 28, 2013
  35. David AguilarJan 28, 2013
  36. Philip OakleyJan 28, 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.