projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8e97852 364bc11)
Merge branch 'so/log-diff-merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Apr 2021 04:50:26 +0000 (13:50 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Apr 2021 04:50:26 +0000 (13:50 +0900)
commit59bb0aa93e6edaca44b2a5488fc915d468bae46f
tree767fc86623415632a6cbee709b2484bf0d91d53atree | snapshot
parent8e97852919fa422bc5fe57bc7e71826cf2b5224dcommit | diff
parent364bc11fe5711fe7fbb98abf376168a207e7a448commit | diff
Merge branch 'so/log-diff-merge'

"git log" learned "--diff-merges=<style>" option, with an
associated configuration variable log.diffMerges.

* so/log-diff-merge:
  doc/diff-options: document new --diff-merges features
  diff-merges: introduce log.diffMerges config variable
  diff-merges: adapt -m to enable default diff format
  diff-merges: refactor set_diff_merges()
  diff-merges: introduce --diff-merges=on
builtin/log.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.