summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-10-08 21:07:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-08 14:13:11 -0700
commit7bf7f0ba05b999e890f5738e08a7f5f70b71c633 (patch)
treeea281e250fbd1edfaf413e9d9d34e14f5390d843 /Documentation/merge-strategies.txt
parentparse-options.c: use exhaustive "case" arms for "enum parse_opt_result" (diff)
downloadtgif-7bf7f0ba05b999e890f5738e08a7f5f70b71c633.tar.xz
parse-options.h: make the "flags" in "struct option" an enum
Change the "flags" members of "struct option" to refer to their corresponding "enum" defined earlier in the file. The benefit of changing this to an enum isn't as great as with some "enum parse_opt_type" as we'll always check this as a bitfield, so we can't rely on the compiler checking "case" arms for us. But let's do it for consistency with the rest of the file. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions