From: Johannes Sixt <j.sixt@viscovery.net>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, spearce@spearce.org
Subject: Re: [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts.
Date: Fri, 02 Apr 2010 10:37:39 +0200 [thread overview]
Message-ID: <4BB5ACD3.10307@viscovery.net> (raw)
In-Reply-To: <v2z2cfc40321003311252s86d44ad7l540559eafb0636d4@mail.gmail.com>
Am 31.03.2010 21:52, schrieb Jon Seymour:
> I agree that removing the options is better than preserving the
> current behaviour,
So, we are in agreement in this. Suppose we do remove them. What remains
that is dangerous?
The user has no option to accidentally revert changes that are not
displayed even if the current diff --cc remains. The user is forced to run
mergetool or to go to the editor.
It is now an orthogonal matter whether diff --cc is helpful. Here I do
agree somewhat that diff against HEAD is more helpful than the current
diff --cc.
> I would imagine that a change that proposed to remove the actions,
> without an option to enable them, would encounter stiff resistance
> from the list. However, perhaps the list can respond?
Who knows? There was not a lot discussion when the feature was presented
to the list, not even a word of excitement.
http://thread.gmane.org/gmane.comp.version-control.git/94425/focus=94426
-- Hannes
next prev parent reply other threads:[~2010-04-02 8:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 15:34 [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts Jon Seymour
2010-03-31 7:20 ` Johannes Sixt
2010-03-31 11:12 ` Jon Seymour
2010-03-31 11:39 ` Johannes Sixt
2010-03-31 11:50 ` Jon Seymour
2010-03-31 12:23 ` Jon Seymour
2010-03-31 13:51 ` Johannes Sixt
2010-03-31 19:52 ` Jon Seymour
2010-04-02 8:37 ` Johannes Sixt [this message]
2010-04-04 6:44 ` Jon Seymour
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=4BB5ACD3.10307@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=jon.seymour@gmail.com \
--cc=spearce@spearce.org \
/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).