| commit | 00cbaf93628282779504b470653ad239c4eca463 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Dec 2021 23:03:15 +0000 (21 15:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Dec 2021 23:03:15 +0000 (21 15:03 -0800) | ||
| tree | 0c6bf318a2e00ef74aa2cf56bb82db08e74bcc8a | treesnapshot (tar.gz zip) |
| parent | 57f28f40943c077ef1dc11c693d693b1bd6b7f2f | commitdiff |
| parent | be738607934ceb0c99fbcc81bb1949413acd3459 | commitdiff |
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"
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"