summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:52 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:52 +0900
commit54b469b9e9a9f276a5980265cd2abeb003cb6bf3 (patch)
tree3f49a8bb58e9a36a00a3556990ae9e39e0815eaf /builtin/merge-recursive.c
parentMerge branch 'tg/checkout-no-overlay' (diff)
parentdiff.c: convert --raw (diff)
downloadtgif-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.tar.xz
Merge branch 'nd/diff-parseopt'
The diff machinery, one of the oldest parts of the system, which long predates the parse-options API, uses fairly long and complex handcrafted option parser. This is being rewritten to use the parse-options API. * nd/diff-parseopt: diff.c: convert --raw diff.c: convert -W|--[no-]function-context diff.c: convert -U|--unified diff.c: convert -u|-p|--patch diff.c: prepare to use parse_options() for parsing diff.h: avoid bit fields in struct diff_flags diff.h: keep forward struct declarations sorted parse-options: allow ll_callback with OPTION_CALLBACK parse-options: avoid magic return codes parse-options: stop abusing 'callback' for lowlevel callbacks parse-options: add OPT_BITOP() parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN parse-options: add one-shot mode parse-options.h: remove extern on function prototypes
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions