From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Dec 2021 23:03:15 +0000 (-0800)
Subject: Merge branch 'jk/log-decorate-opts-with-implicit-decorate'
X-Git-Tag: v2.35.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00cbaf93628282779504b470653ad239c4eca463;p=thirdparty%2Fgit.git

Merge branch 'jk/log-decorate-opts-with-implicit-decorate'

When "git log" implicitly enabled the "decoration" processing
without being explicitly asked with "--decorate" option, it failed
to read and honor the settings given by the "--decorate-refs"
option.

* jk/log-decorate-opts-with-implicit-decorate:
  log: load decorations with --simplify-by-decoration
  log: handle --decorate-refs with userformat "%d"
---

00cbaf93628282779504b470653ad239c4eca463