git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/3] Change "--diff-merges" to require parameter

From
Sergey Organov <sorganov@gmail.com>
Date
Aug 5, 2020, 22:08 UTC
Message-ID
<20200805220832.3800-1-sorganov@gmail.com>

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: Sergey Organov
Message 1 of 17 in “Change "--diff-merges" to require parameter”
  1. 0/3 Change "--diff-merges" to require parameterSergey Organov, Aug 5, 2020
  2. 2/3 doc/git-log: describe --diff-merges=offSergey Organov, Aug 5, 2020
  3. Junio C HamanoAug 12, 2020
  4. Junio C HamanoAug 12, 2020
  5. Sergey OrganovAug 12, 2020
  6. 1/3 revision: change "--diff-merges" option to require parameterSergey Organov, Aug 5, 2020
  7. 3/3 t/t4013: add test for --diff-merges=offSergey Organov, Aug 5, 2020
  8. Junio C HamanoAug 5, 2020
  9. Sergey OrganovAug 5, 2020
  10. Junio C HamanoAug 5, 2020
  11. Junio C HamanoAug 5, 2020
  12. Sergey OrganovAug 6, 2020
  13. Junio C HamanoAug 6, 2020
  14. Sergey OrganovAug 6, 2020
  15. Sergey OrganovAug 7, 2020
  16. Junio C HamanoAug 17, 2020
  17. Sergey OrganovAug 17, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.