From: Junio C Hamano <gitster@pobox.com>
To: Teemu Likonen <tlikonen@iki.fi>
Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder@ira.uka.de>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH] merge, pull: introduce '--diffstat' option
Date: Sat, 05 Apr 2008 11:51:51 -0700 [thread overview]
Message-ID: <7vtzigw2wo.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200804051835.54097.tlikonen@iki.fi> (Teemu Likonen's message of "Sat, 5 Apr 2008 18:35:53 +0300")
Teemu Likonen <tlikonen@iki.fi> writes:
> How about this: Officially and explicitly deprecate --(no-)summary and
> advertise --(no-)diffstat as replacement. Also advertise that in some
> future release --(no-)summary will have different meaning (i.e.
> equivalent to merge.summary). There would be a reasonable (?) period
> before changing the meaning of --(no-)summary.
>
> This is a bit hassle...
I'd favor, in the longer run:
* --stat option to mean "show the diffstat between ORIG_HEAD and merge
result" (i.e. current --summary);
* perhaps a new configuration merge.stat to control the default for the
above;
* merge.log configuration to mean "add list of one-line log to the merge
commit message" (i.e. current merge.summary);
* perhaps a --log option to override the config default for each
invocation.
* deprecate --summary and merge.summary and remove them long after people
are used to the above new set.
Transition needs to happen over time and across a major release bump.
We can do the first four in 1.5.6, and immediately declare deprecation,
and removal of --summary/merge.summary perhaps in 1.6.0.
next prev parent reply other threads:[~2008-04-05 18:52 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-03 9:03 [PATCH 0/2] merge --summary vs. merge.summary SZEDER Gábor
2008-04-03 9:03 ` [PATCH 1/2] merge, pull: rename '--summary' option to '--diffstat' SZEDER Gábor
2008-04-03 9:03 ` [PATCH 2/2] merge, pull: add option to put summary into the merge commit message SZEDER Gábor
2008-04-03 10:30 ` [PATCH 0/2] merge --summary vs. merge.summary Jeff King
2008-04-03 11:03 ` SZEDER Gábor
2008-04-05 14:48 ` [PATCH] merge, pull: introduce '--diffstat' option SZEDER Gábor
2008-04-05 15:35 ` Teemu Likonen
2008-04-05 18:51 ` Junio C Hamano [this message]
2008-04-06 1:23 ` [PATCH 0/6] merge summary and diffstat options cleanup SZEDER Gábor
2008-04-06 1:23 ` [PATCH 1/6] doc: moved merge.* config variables into separate merge-config.txt SZEDER Gábor
2008-04-06 1:23 ` [PATCH 2/6] merge, pull: introduce '--(no-)stat' option SZEDER Gábor
2008-04-06 1:23 ` [PATCH 3/6] add 'merge.stat' config variable SZEDER Gábor
2008-04-06 1:23 ` [PATCH 4/6] fmt-merge-msg: add '--(no-)log' options and 'merge.log' " SZEDER Gábor
2008-04-06 1:23 ` [PATCH 5/6] merge, pull: add '--(no-)log' command line option SZEDER Gábor
2008-04-06 1:23 ` [PATCH 6/6] merge: remove deprecated summary and diffstat options and config variables SZEDER Gábor
2008-04-06 2:36 ` [PATCH 2/6] merge, pull: introduce '--(no-)stat' option Junio C Hamano
2008-04-16 0:38 ` [PATCH v2 00/12] merge summary and diffstat options cleanup SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 01/12] doc: moved merge.* config variables into separate merge-config.txt SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 02/12] merge, pull: introduce '--(no-)stat' options SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 03/12] add 'merge.stat' config variable SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 04/12] t6200-fmt-merge-msg: put expected messages into different files SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 05/12] fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 06/12] merge, pull: add '--(no-)log' command line option SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 07/12] merge, pull: mark '--(no-)summary' options as deprecated SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 08/12] merge, pull: mark the config variable 'merge.diffstat' " SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 09/12] fmt-merge-msg: mark summary-related option and config variable " SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 10/12] merge, pull: remove deprecated '--(no-)summary' options SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 11/12] merge, pull: remove deprecated 'merge.diffstat' config variable SZEDER Gábor
2008-04-16 0:39 ` [PATCH v2 12/12] fmt-merge-msg: remove deprecated summary-related options and " SZEDER Gábor
2008-04-16 4:23 ` [PATCH v2 00/12] merge summary and diffstat options cleanup Junio C Hamano
2008-04-06 13:53 ` [PATCH] merge, pull: introduce '--diffstat' option Jeff King
2008-04-06 14:37 ` Jakub Narebski
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=7vtzigw2wo.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
--cc=tlikonen@iki.fi \
/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).