From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v1.8.3-rc0
Date: Sat, 27 Apr 2013 10:18:33 +0100 [thread overview]
Message-ID: <20130427091833.GB472@serenity.lan> (raw)
In-Reply-To: <7vvc78u8jl.fsf@alter.siamese.dyndns.org>
On Fri, Apr 26, 2013 at 05:22:22PM -0700, Junio C Hamano wrote:
> * "git difftool" allows the user to write into the temporary files
> being shown; if the user makes changes to the working tree at the
> same time, one of the changes has to be lost in such a case, but it
> tells the user what happened and refrains from overwriting the copy
> in the working tree.
This feels slightly misleading to me, perhaps something like this would
be clearer?
"git difftool" allows the user to write into the temporary files
being shown; if the user makes changes to the working tree at the
same time, it now refrains from overwriting the copy in the working
tree and leaves the temporary file so that changes can be merged
manually.
next prev parent reply other threads:[~2013-04-27 9:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-27 0:22 [ANNOUNCE] Git v1.8.3-rc0 Junio C Hamano
2013-04-27 2:24 ` shawn wilson
2013-04-27 5:32 ` Michael Haggerty
2013-04-28 21:12 ` Junio C Hamano
2013-04-27 9:18 ` John Keeping [this message]
2013-04-29 3:31 ` Junio C Hamano
2013-04-29 19:15 ` [PATCH] Fix grammar in the 1.8.3 release notes Marc Branchaud
2013-04-29 21:15 ` Junio C Hamano
2013-04-29 21:16 ` Junio C Hamano
2013-04-30 14:28 ` Marc Branchaud
2013-05-01 8:24 ` Lukas Fleischer
2013-05-01 14:06 ` Marc Branchaud
2013-05-01 17:55 ` Junio C Hamano
2013-04-29 21:20 ` Junio C Hamano
2013-04-30 3:09 ` Eric Sunshine
2013-04-30 15:12 ` Phil Hord
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=20130427091833.GB472@serenity.lan \
--to=john@keeping.me.uk \
--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 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).