From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v3 0/4] notes: add support for notes.merge option
Date: Sun, 2 Aug 2015 03:10:22 -0700 [thread overview]
Message-ID: <1438510226-1163-1-git-send-email-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
This series incorporates the feedback from both Johan and Eric. In
addition, I included an RFC implementing suggestion from Johan regarding
per-ref merge strategies.
I split the tests for --merge/--commit/--strategy out into their own
patch to help review and keep the "one commit = one change" logic.
I am not certain the RFC is ready yet, but the first 3 patches (now
based on next) should be ready to go.
Jacob Keller (4):
notes: document cat_sort_uniq rewriteMode
notes: add tests for --commit/--abort/--strategy exclusivity
notes: add notes.merge option to select default strategy
notes: add per-ref configuration of merge strategy
Documentation/config.txt | 18 +++-
Documentation/git-notes.txt | 23 ++++-
builtin/notes.c | 167 ++++++++++++++++++++++++++++++----
notes-merge.h | 16 ++--
t/t3309-notes-merge-auto-resolve.sh | 79 ++++++++++++++++
t/t3310-notes-merge-manual-resolve.sh | 12 +++
6 files changed, 288 insertions(+), 27 deletions(-)
--
2.5.0.482.gfcd5645
next reply other threads:[~2015-08-02 10:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-02 10:10 Jacob Keller [this message]
2015-08-02 10:10 ` [PATCH v3 1/4] notes: document cat_sort_uniq rewriteMode Jacob Keller
2015-08-02 10:10 ` [PATCH v3 2/4] notes: add tests for --commit/--abort/--strategy exclusivity Jacob Keller
2015-08-02 10:10 ` [PATCH v3 3/4] notes: add notes.merge option to select default strategy Jacob Keller
2015-08-05 20:47 ` Junio C Hamano
2015-08-06 22:37 ` Eric Sunshine
2015-08-02 10:10 ` [PATCH RFC 4/4] notes: add per-ref configuration of merge strategy Jacob Keller
2015-08-05 21:10 ` Junio C Hamano
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=1438510226-1163-1-git-send-email-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.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).