]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'so/diff-merges-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:39 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 17:08:39 +0000 (10:08 -0700)
commitd194e61ea7be1d09534eebf53eb878c37e3361f8
treeec09dcc61c960f42dd3de6ef85cf231fea9700d4
parentab26e44d984933eb98db1bead5c64aa70795c042
parentc34a6bd291d5bfe2bec22d1c5441f8712306a527
Merge branch 'so/diff-merges-cleanup'

Code clean-up.

* so/diff-merges-cleanup:
  diff-merges: clarify log.diffMerges documentation
  diff-merges: cleanup set_diff_merges()
  diff-merges: cleanup func_by_opt()