From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Johan Herland <johan@herland.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v6 0/4] notes.mergestrategy config option
Date: Fri, 14 Aug 2015 13:48:45 -0700 [thread overview]
Message-ID: <1439585329-10542-1-git-send-email-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
Changes since v6:
* use a static git_config_get_notes_strategy function
* use git_die_config to display useful information about which
configuration failed.
This should address Eric's concern. It also makes it so that we don't
even read the configuration at all unless we need to.
Jacob Keller (4):
notes: document cat_sort_uniq rewriteMode
notes: add tests for --commit/--abort/--strategy exclusivity
notes: add notes.mergestrategy option to select default strategy
notes: teach git-notes about notes.<ref>.mergestrategy option
Documentation/config.txt | 18 ++++++++--
Documentation/git-notes.txt | 23 ++++++++++--
builtin/notes.c | 60 ++++++++++++++++++++++++-------
notes-merge.h | 16 +++++----
t/t3309-notes-merge-auto-resolve.sh | 68 +++++++++++++++++++++++++++++++++++
t/t3310-notes-merge-manual-resolve.sh | 12 +++++++
6 files changed, 173 insertions(+), 24 deletions(-)
--
2.5.0.280.g4aaba03
next reply other threads:[~2015-08-14 20:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 20:48 Jacob Keller [this message]
2015-08-14 20:48 ` [PATCH v6 1/4] notes: document cat_sort_uniq rewriteMode Jacob Keller
2015-08-14 20:48 ` [PATCH v6 2/4] notes: add tests for --commit/--abort/--strategy exclusivity Jacob Keller
2015-08-14 20:48 ` [PATCH v6 3/4] notes: add notes.mergestrategy option to select default strategy Jacob Keller
2015-08-14 21:06 ` Eric Sunshine
2015-08-14 21:12 ` Jacob Keller
2015-08-14 20:48 ` [PATCH v6 4/4] notes: teach git-notes about notes.<ref>.mergestrategy option 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=1439585329-10542-1-git-send-email-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=johan@herland.net \
--cc=mhagger@alum.mit.edu \
--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 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).