diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-27 07:35:25 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-27 16:28:18 -0800 |
commit | f62470c650e0db9536f32b9e1ecbe7d25f759031 (patch) | |
tree | a2173e2a99bc2deec3126be06a440b0071bd9d96 /merge.c | |
parent | parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN (diff) | |
download | tgif-f62470c650e0db9536f32b9e1ecbe7d25f759031.tar.xz |
parse-options: add OPT_BITOP()
This is needed for diff_opt_parse() where we do
value = (value & ~mask) | some_more;
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions