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

Re: [PATCH 2/2] mergetool: fix running mergetool in sub-directories

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 7, 2009, 21:48 UTC
Message-ID
<7v3aepuddk.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<49877F68.30509@hashpling.org>
Charles Bailey <charles@hashpling.org> writes:
Show 12 quoted lines
> Junio C Hamano wrote:
>> 
>> I wonder if it would be cleaner to keep $prefix and instead cd_to_toplevel
>> at the beginning.
>> ...
> Possibly, and I certainly wouldn't object if mergetool moved to the
> latter mode of operation in the medium term.
>
> In general, though, mergetool is pretty happy running from the users
> directory and there may be cases in which users expect the merge tool to
> be running from the directory that they started in (saving extra files
> during the merge process?).

A very sensible consideration that I agree with. I am happy that you were the one who volunteered to take this script over.

Previous: Charles Bailey
Message 5 of 5 in “mergetool: Add a test for running mergetool in a sub-directory”
  1. 1/2 mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey, Jan 30, 2009
  2. 2/2 mergetool: fix running mergetool in sub-directoriesCharles Bailey, Jan 30, 2009
  3. Junio C HamanoFeb 1, 2009
  4. Charles BaileyFeb 2, 2009
  5. Junio C HamanoFeb 7, 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.