git/Documentation
Junio C Hamano aac006aa99 Merge branch 'so/log-diff-merge'
"git log" learned a new "--diff-merges=<how>" option.

* so/log-diff-merge: (32 commits)
  t4013: add tests for --diff-merges=first-parent
  doc/git-show: include --diff-merges description
  doc/rev-list-options: document --first-parent changes merges format
  doc/diff-generate-patch: mention new --diff-merges option
  doc/git-log: describe new --diff-merges options
  diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
  diff-merges: add old mnemonic counterparts to --diff-merges
  diff-merges: let new options enable diff without -p
  diff-merges: do not imply -p for new options
  diff-merges: implement new values for --diff-merges
  diff-merges: make -m/-c/--cc explicitly mutually exclusive
  diff-merges: refactor opt settings into separate functions
  diff-merges: get rid of now empty diff_merges_init_revs()
  diff-merges: group diff-merge flags next to each other inside 'rev_info'
  diff-merges: split 'ignore_merges' field
  diff-merges: fix -m to properly override -c/--cc
  t4013: add tests for -m failing to override -c/--cc
  t4013: support test_expect_failure through ':failure' magic
  diff-merges: revise revs->diff flag handling
  diff-merges: handle imply -p on -c/--cc logic for log.c
  ...
2021-02-05 16:40:44 -08:00
..
2020-07-06 22:09:16 -07:00
2021-02-03 15:04:49 -08:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-09-19 15:56:06 -07:00
2021-02-05 16:40:44 -08:00
2021-01-04 11:27:48 -08:00
2020-04-29 16:15:27 -07:00
2019-08-11 17:40:07 -07:00
2019-01-23 11:37:29 -08:00
2021-01-25 14:19:19 -08:00
2020-10-22 10:29:30 -07:00
2018-12-26 14:59:37 -08:00
2021-01-04 11:27:48 -08:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2019-10-21 12:02:39 +09:00