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

Re: [PATCH 1/8] mergetool: use tabs consistently

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 30, 2009, 08:44 UTC
Message-ID
<7vzlf3flim.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1238389428-69328-2-git-send-email-davvid@gmail.com>
Thanks.

Even though this [1/8] is obviously regression free, and I think the overall direction in which the series is going is good, I'll wait until I hear Acks from Charles Bailey for the parts that involve mergetool. I do not use either mergetool nor difftool myself, and going over every single line of this series to spot potential regression is beyond my bandwidth right now.

I do not think bits only common between mergetool and difftool should be called with a very generic name "sh-tools". We didn't call the result of a similar refactoring for launching web browser from help and instaweb context with such a generic name (it is called git-web--browse).

Previous: David AguilarNext: David Aguilar
Message 13 of 19 in “(unknown)”
  1. David AguilarMar 30, 2009
  2. 1/8 mergetool: use tabs consistentlyDavid Aguilar, Mar 30, 2009
  3. 2/8 mergetool: use $( ... ) instead of `backticks`David Aguilar, Mar 30, 2009
  4. 3/8 sh-tools: add a git-sh-tools shell helper scriptDavid Aguilar, Mar 30, 2009
  5. 4/8 mergetool: refactor git-mergetool to use git-sh-toolsDavid Aguilar, Mar 30, 2009
  6. 5/8 difftool: refactor git-difftool to use git-sh-toolsDavid Aguilar, Mar 30, 2009
  7. 6/8 sh-tools: add a run_merge_tool functionDavid Aguilar, Mar 30, 2009
  8. 7/8 mergetool: refactor git-mergetool to use run_merge_toolDavid Aguilar, Mar 30, 2009
  9. 8/8 difftool: refactor git-difftool-helper to use run_merge_toolDavid Aguilar, Mar 30, 2009
  10. Markus HeidelbergMar 30, 2009
  11. Markus HeidelbergMar 30, 2009
  12. David AguilarMar 30, 2009
  13. Junio C HamanoMar 30, 2009
  14. David AguilarMar 30, 2009
  15. Charles BaileyMar 30, 2009
  16. David AguilarMar 31, 2009
  17. Junio C HamanoApr 1, 2009
  18. Markus HeidelbergMar 30, 2009
  19. Junio C HamanoMar 30, 2009

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.