From: Charles Bailey <charles@hashpling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)
Date: Sat, 9 Aug 2014 21:01:05 +0100 [thread overview]
Message-ID: <20140809200105.GA25206@hashpling.org> (raw)
In-Reply-To: <xmqq1tsqk4m4.fsf@gitster.dls.corp.google.com>
On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote:
> * 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.
next prev parent reply other threads:[~2014-08-09 20:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 22:18 What's cooking in git.git (Aug 2014, #02; Fri, 8) Junio C Hamano
2014-08-08 23:44 ` Duy Nguyen
2014-09-06 10:31 ` [PATCH v4 0/1] Use absolute paths of lockfiles Michael Haggerty
2014-09-06 10:31 ` [PATCH v4 1/1] lockfile.c: store absolute path Michael Haggerty
2014-09-06 13:30 ` [PATCH v4 0/1] Use absolute paths of lockfiles Duy Nguyen
2014-09-10 1:47 ` Yue Lin Ho
2014-10-15 2:44 ` Yue Lin Ho
2014-08-09 20:01 ` Charles Bailey [this message]
2014-08-10 2:42 ` What's cooking in git.git (Aug 2014, #02; Fri, 8) Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140809200105.GA25206@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.