From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: js/difftool-no-index, was Re: What's cooking in git.git (May 2019, #02; Tue, 14)
Date: Tue, 14 May 2019 11:54:26 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905141153150.44@tvgsbejvaqbjf.bet> (raw)
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
next prev parent reply other threads:[~2019-05-14 9:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 16:11 What's cooking in git.git (May 2019, #02; Tue, 14) Junio C Hamano
2019-05-13 22:20 ` Elijah Newren
2019-05-14 9:54 ` Johannes Schindelin [this message]
2019-05-15 1:28 ` js/difftool-no-index, was " Junio C Hamano
2019-05-15 8:24 ` Johannes Schindelin
2019-05-15 8:50 ` Junio C Hamano
2019-05-17 18:27 ` Johannes Schindelin
2019-05-19 1:44 ` Junio C Hamano
2019-05-21 22:28 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1905141153150.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).