From: Junio C Hamano <gitster@pobox•com>
To: John Keeping <john@keeping•me.uk>
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 15:15:44 -0700 [thread overview]
Message-ID: <7vobe4jxpr.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130327220723.GR2286@serenity.lan> (John Keeping's message of "Wed, 27 Mar 2013 22:07:23 +0000")
John Keeping <john@keeping•me.uk> writes:
> 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?
I am somewhat reluctant to rewind a topic that has been cooking in
'next' for over a week (the above says 19th). Rebuilding the
style-fixes on top of the above is fine---that topic is much
younger.
next prev parent reply other threads:[~2013-03-27 22:16 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
2013-03-27 22:15 ` Junio C Hamano [this message]
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=7vobe4jxpr.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=john@keeping$(echo .)me.uk \
--cc=jrnieder@gmail$(echo .)com \
--cc=matt@blissett$(echo .)me.uk \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=philipoakley@iee$(echo .)org \
--cc=trast@student$(echo .)ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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