diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:15 -0800 |
| commit | 00cbaf93628282779504b470653ad239c4eca463 (patch) | |
| tree | 0c6bf318a2e00ef74aa2cf56bb82db08e74bcc8a /unicode-width.h | |
| parent | Merge branch 'en/rebase-x-wo-git-dir-env' (diff) | |
| parent | log: load decorations with --simplify-by-decoration (diff) | |
| download | tgif-00cbaf93628282779504b470653ad239c4eca463.tar.xz | |
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"
Diffstat (limited to 'unicode-width.h')
0 files changed, 0 insertions, 0 deletions