diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:21:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:21:58 -0800 |
| commit | 17066bea38d14a9f9a7a174f40cd9dc1fd720210 (patch) | |
| tree | 66c932b0150f221909cd2dac863511fb3579217d /revision.h | |
| parent | 135365dd991f9520406012e30ab27a8d22951df8 (diff) | |
| parent | e0f9095aaa56f5c731faced2e61ca48df5caedfb (diff) | |
| download | git-17066bea38d14a9f9a7a174f40cd9dc1fd720210.tar.gz | |
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 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.h b/revision.h index a1a804bd3d..475f048fb6 100644 --- a/revision.h +++ b/revision.h @@ -190,10 +190,10 @@ struct rev_info { always_show_header:1; /* Format info */ + int show_notes; unsigned int shown_one:1, shown_dashes:1, show_merge:1, - show_notes:1, show_notes_given:1, show_signature:1, pretty_given:1, |