From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
"Thomas Rast" <trast@student.ethz.ch>,
git@vger.kernel.org, "Philip Oakley" <philipoakley@iee.org>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Matthew Blissett" <matt@blissett.me.uk>,
"David Aguilar" <davvid@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>
Subject: Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)
Date: Wed, 27 Mar 2013 22:07:23 +0000 [thread overview]
Message-ID: <20130327220723.GR2286@serenity.lan> (raw)
In-Reply-To: <7vy5d8jz0y.fsf@alter.siamese.dyndns.org>
On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote:
> > * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits
> > (merged to 'next' on 2013-03-19 at e68014a)
> > + difftool --dir-diff: symlink all files matching the working tree
> > + difftool: avoid double slashes in symlink targets
> > + git-difftool(1): fix formatting of --symlink description
>
> I lost track of various discussions on "difftool" and its "symlink
> so that the user can edit working tree files in the tool".
Would it be easiest if I send a new series incorporating
jk/difftool-dirr-diff-edit-fix and the proposed change to not overwrite
modified working tree files, built on top of t7800-modernize?
The "overwrite modified working tree files" issue isn't new, but
jk/difftool-dir-diff-edit-fix makes it more likely to happen so it might
be best to include those in one topic, and building on
jk/t7800-modernize will avoid conflicts in the tests.
next prev parent reply other threads:[~2013-03-27 22:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 22:40 What's cooking in git.git (Mar 2013, #07; Tue, 26) Junio C Hamano
2013-03-27 20:35 ` Jeff King
2013-03-27 20:50 ` Junio C Hamano
2013-03-27 20:52 ` Jeff King
2013-03-27 20:50 ` Thomas Rast
2013-03-27 21:47 ` Junio C Hamano
2013-03-27 22:07 ` John Keeping [this message]
2013-03-27 22:15 ` Junio C Hamano
2013-03-27 22:52 ` John Keeping
2013-03-28 21:40 ` Junio C Hamano
2013-03-27 22:25 ` jn/add-2.0-u-A-sans-pathspec (Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)) Jonathan Nieder
2013-03-28 8:00 ` What's cooking in git.git (Mar 2013, #07; Tue, 26) Thomas Rast
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=20130327220723.GR2286@serenity.lan \
--to=john@keeping.me.uk \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=matt@blissett.me.uk \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=trast@student.ethz.ch \
/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 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 NNTP newsgroup(s).