diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:21:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:21:58 +0300 |
| commit | 17066bea38d14a9f9a7a174f40cd9dc1fd720210 (patch) | |
| tree | 66c932b0150f221909cd2dac863511fb3579217d /Documentation | |
| parent | 135365dd991f9520406012e30ab27a8d22951df8 (diff) | |
| parent | e0f9095aaa56f5c731faced2e61ca48df5caedfb (diff) | |
Merge branch 'dl/format-patch-notes-config-fixup'
"git format-patch" can take a set of configured format.notes values
to specify which notes refs to use in the log message part of the
output. The behaviour of this was not consistent with multiple
--notes command line options, which has been corrected.
* dl/format-patch-notes-config-fixup:
notes.h: fix typos in comment
notes: break set_display_notes() into smaller functions
config/format.txt: clarify behavior of multiple format.notes
format-patch: move git_config() before repo_init_revisions()
format-patch: use --notes behavior for format.notes
notes: extract logic into set_display_notes()
notes: create init_display_notes() helper
notes: rename to load_display_notes()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/format.txt | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 513fcd88d5..45c7bd5a8f 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -106,4 +106,20 @@ If one wishes to use the ref `ref/notes/true`, please use that literal instead. + This configuration can be specified multiple times in order to allow -multiple notes refs to be included. +multiple notes refs to be included. In that case, it will behave +similarly to multiple `--[no-]notes[=]` options passed in. That is, a +value of `true` will show the default notes, a value of `<ref>` will +also show notes from that notes ref and a value of `false` will negate +previous configurations and not show notes. ++ +For example, ++ +------------ +[format] + notes = true + notes = foo + notes = false + notes = bar +------------ ++ +will only show notes from `refs/notes/bar`. |