From: Junio C Hamano <gitster@pobox.com>
To: Johan Herland <johan@herland.net>
Cc: Jacob Keller <jacob.e.keller@intel.com>,
Git mailing list <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v8 4/8] notes: allow use of the "rewrite" terminology for merge strategies
Date: Mon, 17 Aug 2015 12:35:28 -0700 [thread overview]
Message-ID: <xmqqoai5d7y7.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CALKQrgfLzWdRxC5saBXJ_-iKmVDfs+mBfDKKrSU2-tP7eO5+Zg@mail.gmail.com> (Johan Herland's message of "Mon, 17 Aug 2015 14:54:18 +0200")
Johan Herland <johan@herland.net> writes:
> On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller <jacob.e.keller@intel.com> wrote:
>> From: Jacob Keller <jacob.keller@gmail.com>
>>
>> notes-merge.c already re-uses the same functions for the automatic merge
>> strategies used by the rewrite functionality. Teach the -s/--strategy
>> option how to interpret the equivalent rewrite terminology for
>> consistency.
>
> I'm somewhat negative to this patch. IMHO, adding the rewrite modes as
> merge strategy synonyms adds no benefit - only potential confusion -
> to the existing merge strategies. ...
> ... By committing to these synonyms now, you might
> actually be making things harder for the future author: once the
> synonyms are part of the user-visible and documented interface, they
> cannot easily be removed/changed again.
OK. Thanks.
next prev parent reply other threads:[~2015-08-17 19:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 8:46 [PATCH v8 0/8] implement notes.mergeStrategy option Jacob Keller
2015-08-17 8:46 ` [PATCH v8 1/8] notes: document cat_sort_uniq rewriteMode Jacob Keller
2015-08-17 8:46 ` [PATCH v8 2/8] notes: extract enum notes_merge_strategy to notes-utils.h Jacob Keller
2015-08-17 8:46 ` [PATCH v8 3/8] note: extract parse_notes_merge_strategy to notes-utils Jacob Keller
2015-08-17 8:46 ` [PATCH v8 4/8] notes: allow use of the "rewrite" terminology for merge strategies Jacob Keller
2015-08-17 12:54 ` Johan Herland
2015-08-17 18:28 ` Jacob Keller
2015-08-17 19:35 ` Junio C Hamano [this message]
2015-08-17 8:46 ` [PATCH v8 5/8] notes: implement parse_combine_rewrite_fn using parse_notes_merge_strategy Jacob Keller
2015-08-17 8:46 ` [PATCH v8 6/8] notes: add tests for --commit/--abort/--strategy exclusivity Jacob Keller
2015-08-17 8:46 ` [PATCH v8 7/8] notes: add notes.mergeStrategy option to select default strategy Jacob Keller
2015-08-17 8:46 ` [PATCH v8 8/8] notes: teach git-notes about notes.<ref>.mergeStrategy option Jacob Keller
2015-08-17 13:21 ` Johan Herland
2015-08-17 18:25 ` Jacob Keller
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=xmqqoai5d7y7.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=johan@herland.net \
--cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.