diff-merges: add old mnemonic counterparts to --diff-merges

Sergey Organov committed over 5 years ago

diff-merges: let new options enable diff without -p

Sergey Organov committed over 5 years ago

diff-merges: do not imply -p for new options

Sergey Organov committed over 5 years ago

diff-merges: implement new values for --diff-merges

Sergey Organov committed over 5 years ago

diff-merges: make -m/-c/--cc explicitly mutually exclusive

Sergey Organov committed over 5 years ago

diff-merges: refactor opt settings into separate functions

Sergey Organov committed over 5 years ago

diff-merges: get rid of now empty diff_merges_init_revs()

Sergey Organov committed over 5 years ago

diff-merges: group diff-merge flags next to each other inside 'rev_info'

Sergey Organov committed over 5 years ago

diff-merges: split 'ignore_merges' field

Sergey Organov committed over 5 years ago

diff-merges: fix -m to properly override -c/--cc

Sergey Organov committed over 5 years ago

t4013: add tests for -m failing to override -c/--cc

Sergey Organov committed over 5 years ago

t4013: support test_expect_failure through ':failure' magic

Sergey Organov committed over 5 years ago

diff-merges: revise revs->diff flag handling

Sergey Organov committed over 5 years ago

diff-merges: handle imply -p on -c/--cc logic for log.c

Sergey Organov committed over 5 years ago

diff-merges: introduce revs->first_parent_merges flag

Sergey Organov committed over 5 years ago

diff-merges: new function diff_merges_set_dense_combined_if_unset()

Sergey Organov committed over 5 years ago

diff-merges: new function diff_merges_suppress()

Sergey Organov committed over 5 years ago

diff-merges: re-arrange functions to match the order they are called in

Sergey Organov committed over 5 years ago

diff-merges: rename diff_merges_default_to_enable() to match semantics

Sergey Organov committed over 5 years ago

diff-merges: move checks for first_parent_only out of the module

Sergey Organov committed over 5 years ago