From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH 0/2] add notes.merge configuration variable
Date: Fri, 31 Jul 2015 12:21:34 -0700 [thread overview]
Message-ID: <1438370496-26433-1-git-send-email-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
This small series is a precursor to some thoughts I have for enabling
easier notes collaboration. First, make it so that users can configure
the default notes merge strategy. Mostly useful if you always want to
use cat_sort_uniq.
I also found that the rewriteMode supports cat_sort_uniq but does not
document this fact.
Jacob Keller (2):
notes: document cat_sort_uniq rewriteMode
notes: add notes.merge option to select default strategy
Documentation/config.txt | 11 ++++-
Documentation/git-notes.txt | 33 +++++++++------
builtin/notes.c | 75 +++++++++++++++++++++++++----------
notes-merge.h | 16 ++++----
t/t3309-notes-merge-auto-resolve.sh | 29 ++++++++++++++
t/t3310-notes-merge-manual-resolve.sh | 12 ++++++
6 files changed, 133 insertions(+), 43 deletions(-)
--
2.5.0.482.gfcd5645
next reply other threads:[~2015-07-31 19:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-31 19:21 Jacob Keller [this message]
2015-07-31 19:21 ` [PATCH 1/2] notes: document cat_sort_uniq rewriteMode Jacob Keller
2015-07-31 19:21 ` [PATCH 2/2] notes: add notes.merge option to select default strategy Jacob Keller
2015-07-31 21:12 ` Eric Sunshine
2015-07-31 20:00 ` [PATCH 0/2] add notes.merge configuration variable 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=1438370496-26433-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).