From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 14 May 2019 09:54:26 GMT
Subject: js/difftool-no-index, was Re: What's cooking in git.git (May 2019, #02; Tue, 14)
Message-ID: <nycvar.QRO.7.76.6.1905141153150.44@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqa7fqbahj.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Tue, 14 May 2019, Junio C Hamano wrote:

> * js/difftool-no-index (2019-05-09) 1 commit
>  - difftool --no-index: error out on --dir-diff (and don't crash)
>
>  The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
>  mode; they are now explicitly marked as mutually incompatible.
>
>  Will merge to 'next'.

Seeing as the following is a part of v2.22.0-rc0's release notes:

	 * "git difftool" can now run outside a repository.

maybe we could get this to `master` instead of `next`?

Thanks,
Dscho