]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 57f28f4 be73860)
Merge branch 'jk/log-decorate-opts-with-implicit-decorate'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:15 +0000 (15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:15 +0000 (15:03 -0800)
commit00cbaf93628282779504b470653ad239c4eca463
tree0c6bf318a2e00ef74aa2cf56bb82db08e74bcc8atree
parent57f28f40943c077ef1dc11c693d693b1bd6b7f2fcommit | diff
parentbe738607934ceb0c99fbcc81bb1949413acd3459commit | diff
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"
Unnamed repository; edit this file 'description' to name the repository.