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

Re: [PATCH 6/8 v2] sh-tools: add a run_merge_tool function

From
JPJames Pickens <jepicken@gmail.com>
Date
Mar 31, 2009, 18:15 UTC
Message-ID
<885649360903311115o6131988emdcba6ef215ec0ab0@mail.gmail.com>
In-Reply-To
<1238400684-14881-1-git-send-email-davvid@gmail.com>
On Mon, Mar 30, 2009 at 1:11 AM, David Aguilar <davvid@gmail.com> wrote:
> This function launches merge tools and will be used to refactor
> git-(diff|merge)tool.

Thanks for writing difftool; I find it quite useful. I tried it with tkdiff, and noticed that it shows the 'merge preview' window even though it isn't doing a merge. If a user with unstaged changes were to carelessly click the 'save and exit' button, his changes could be lost. So I think it's a good idea to stop the merge preview window from showing up under difftool. To do that I think you just have to remove the '-o "$MERGED"' option to tkdiff.

James
Previous: David AguilarNext: Markus Heidelberg
Message 2 of 5 in “sh-tools: add a run_merge_tool function”
  1. 6/8 sh-tools: add a run_merge_tool functionDavid Aguilar, Mar 30, 2009
  2. James PickensMar 31, 2009
  3. Markus HeidelbergMar 31, 2009
  4. David AguilarApr 1, 2009
  5. David AguilarApr 2, 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.