From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, Sergey Organov <sorganov@gmail.com>
Subject: [PATCH 0/3] Change "--diff-merges" to require parameter
Date: Thu, 6 Aug 2020 01:08:29 +0300 [thread overview]
Message-ID: <20200805220832.3800-1-sorganov@gmail.com> (raw)
These patches present a minimal set of changes to turn --diff-merges
to require parameter. For now we only introduce --diff-merges=off as
synonym for --no-diff-merges.
These are on top of jk/log-fp-implies-m "making --first-parent imply -m"
by Jeff King, that introduced --[no-]diff-merges as a boolean option to
provide ability to override implied -m by --no-diff-merges.
Sergey Organov (3):
revision: change "--diff-merges" option to require parameter
doc/git-log: describe --diff-merges=off
t/t4013: add test for --diff-merges=off
Documentation/git-log.txt | 6 +-
revision.c | 9 ++-
t/t4013-diff-various.sh | 1 +
...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++
4 files changed, 92 insertions(+), 2 deletions(-)
create mode 100644 t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
--
2.20.1
next reply other threads:[~2020-08-05 22:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 22:08 Sergey Organov [this message]
2020-08-05 22:08 ` [PATCH 1/3] revision: change "--diff-merges" option " Sergey Organov
2020-08-05 22:08 ` [PATCH 2/3] doc/git-log: describe --diff-merges=off Sergey Organov
2020-08-12 0:06 ` Junio C Hamano
2020-08-12 0:48 ` Junio C Hamano
2020-08-12 8:08 ` Sergey Organov
2020-08-05 22:08 ` [PATCH 3/3] t/t4013: add test for --diff-merges=off Sergey Organov
2020-08-05 22:31 ` Junio C Hamano
2020-08-05 22:44 ` Sergey Organov
2020-08-05 23:19 ` Junio C Hamano
2020-08-05 23:44 ` Junio C Hamano
2020-08-06 8:34 ` Sergey Organov
2020-08-06 17:10 ` Junio C Hamano
2020-08-06 20:52 ` Sergey Organov
2020-08-07 23:11 ` Sergey Organov
2020-08-17 17:17 ` Junio C Hamano
2020-08-17 20:36 ` Sergey Organov
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=20200805220832.3800-1-sorganov@gmail.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--subject='Re: [PATCH 0/3] Change "--diff-merges" to require parameter' \
/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
Code repositories for project(s) associated with this 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).