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

Re: [PATCH] mergetool: Use args as pathspec to unmerged files

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 26, 2011, 16:40 UTC
Message-ID
<7v4nzz5kb5.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110925004459.GA19780@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 6 quoted lines
>> Ack from mergetool/difftool folks?
> ...
> Acked-by: David Aguilar <davvid@gmail.com>
>
> Being able to do "git mergetool -- subdir" is very nice!
> Thanks guys,
Thanks.
Previous: David AguilarNext: Junio C Hamano
Message 18 of 36 in “What's cooking in git.git (Sep 2011, #04; Mon, 12)”
  1. Junio C HamanoSep 12, 2011
  2. Junio C HamanoSep 12, 2011
  3. Junio C HamanoSep 12, 2011
  4. Jeff KingSep 12, 2011
  5. Junio C HamanoSep 13, 2011
  6. Nguyen Thai Ngoc DuySep 13, 2011
  7. Junio C HamanoSep 12, 2011
  8. Documentation: basic configuration of notes.rewriteRefThomas Rast, Sep 13, 2011
  9. Junio C HamanoSep 13, 2011
  10. Jeff KingSep 13, 2011
  11. Junio C HamanoSep 12, 2011
  12. Junio C HamanoSep 12, 2011
  13. Jonathon MahSep 14, 2011
  14. Junio C HamanoSep 14, 2011
  15. mergetool: Use args as pathspec to unmerged filesJonathon Mah, Sep 16, 2011
  16. Junio C HamanoSep 16, 2011
  17. David AguilarSep 25, 2011
  18. Junio C HamanoSep 26, 2011
  19. Junio C HamanoSep 12, 2011
  20. Sverre RabbelierSep 12, 2011
  21. Junio C HamanoSep 12, 2011
  22. Erik Faye-LundSep 13, 2011
  23. Pascal ObrySep 29, 2011
  24. Junio C HamanoSep 12, 2011
  25. Michael J GruberSep 13, 2011
  26. Eric SunshineSep 12, 2011
  27. Junio C HamanoSep 12, 2011
  28. Jeff KingSep 12, 2011
  29. Jeff KingSep 12, 2011
  30. Brandon CaseySep 13, 2011
  31. Jeff KingSep 13, 2011
  32. Brandon CaseySep 13, 2011
  33. John SzakmeisterSep 13, 2011
  34. Eric SunshineSep 13, 2011
  35. Jeff KingSep 13, 2011
  36. Junio C HamanoSep 12, 2011

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.