tree 4e43a17a745392858901709f84e18c237c725514
parent ad8f0368b45bf1ab0f1339033d0a62cee94b1ae2
parent 0cc7380d8846c30ce0d5d6310b2cb5994f269133
author Junio C Hamano <gitster@pobox.com> 1570415574 +0900
committer Junio C Hamano <gitster@pobox.com> 1570415574 +0900

Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'

"git log --decorate-refs-exclude=<pattern>" was incorrectly
overruled when the "--simplify-by-decoration" option is used, which
has been corrected.

* rs/simplify-by-deco-with-deco-refs-exclude:
  log-tree: call load_ref_decorations() in get_name_decoration()
  log: test --decorate-refs-exclude with --simplify-by-decoration