git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH  0/3] Change "--diff-merges" to require parameter
@ 2020-08-05 22:08 Sergey Organov
  2020-08-05 22:08 ` [PATCH 1/3] revision: change "--diff-merges" option " Sergey Organov
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Sergey Organov @ 2020-08-05 22:08 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Jeff King, git, Sergey Organov

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


^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2020-08-17 20:37 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-05 22:08 [PATCH 0/3] Change "--diff-merges" to require parameter Sergey Organov
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

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).