summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-12-21 15:03:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-21 15:03:15 -0800
commit00cbaf93628282779504b470653ad239c4eca463 (patch)
tree0c6bf318a2e00ef74aa2cf56bb82db08e74bcc8a /dir.c
parentMerge branch 'en/rebase-x-wo-git-dir-env' (diff)
parentlog: load decorations with --simplify-by-decoration (diff)
downloadtgif-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 'dir.c')
0 files changed, 0 insertions, 0 deletions