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

Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

From
Charles Bailey <charles@hashpling.org>
Date
Aug 9, 2014, 20:01 UTC
Message-ID
<20140809200105.GA25206@hashpling.org>
In-Reply-To
<xmqq1tsqk4m4.fsf@gitster.dls.corp.google.com>
On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> * cb/mergetool-difftool (2014-07-21) 2 commits
>  - difftool: don't assume that default sh is sane
>  - mergetool: don't require a work tree for --tool-help
> 
>  Update the way the "difftool --help" shows the help message that is
>  shared with the "mergetool" to reduce one shell dependency.
> 
>  Will merge to 'next'.

Can you hold off on merging this? I think I want to have another go at making this neater.

Specifically, --tool-help doesn't need a working tree but I hadn't spotted that it still requires a GIT_DIR / --git-dir when it really shouldn't.

Previous: Yue Lin HoNext: Jeff King
Message 8 of 9 in “What's cooking in git.git (Aug 2014, #02; Fri, 8)”
  1. Junio C HamanoAug 8, 2014
  2. Duy NguyenAug 8, 2014
  3. 0/1 Use absolute paths of lockfilesMichael Haggerty, Sep 6, 2014
  4. 1/1 lockfile.c: store absolute pathMichael Haggerty, Sep 6, 2014
  5. Duy NguyenSep 6, 2014
  6. Yue Lin HoSep 10, 2014
  7. Yue Lin HoOct 15, 2014
  8. Charles BaileyAug 9, 2014
  9. Jeff KingAug 10, 2014

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.