summaryrefslogtreecommitdiffstats
path: root/diff-merges.c
AgeCommit message (Expand)AuthorLines
2021-04-16diff-merges: introduce log.diffMerges config variableSergey Organov-0/+11
2021-04-16diff-merges: adapt -m to enable default diff formatSergey Organov-4/+4
2021-04-16diff-merges: refactor set_diff_merges()Sergey Organov-15/+21
2021-04-16diff-merges: introduce --diff-merges=onSergey Organov-0/+7
2020-12-21diff-merges: add '--diff-merges=1' as synonym for 'first-parent'Sergey Organov-1/+1
2020-12-21diff-merges: add old mnemonic counterparts to --diff-mergesSergey Organov-3/+3
2020-12-21diff-merges: let new options enable diff without -pSergey Organov-5/+12
2020-12-21diff-merges: do not imply -p for new optionsSergey Organov-8/+12
2020-12-21diff-merges: implement new values for --diff-mergesSergey Organov-3/+16
2020-12-21diff-merges: make -m/-c/--cc explicitly mutually exclusiveSergey Organov-0/+3
2020-12-21diff-merges: refactor opt settings into separate functionsSergey Organov-22/+41
2020-12-21diff-merges: get rid of now empty diff_merges_init_revs()Sergey Organov-4/+0
2020-12-21diff-merges: split 'ignore_merges' fieldSergey Organov-18/+13
2020-12-21diff-merges: fix -m to properly override -c/--ccSergey Organov-0/+1
2020-12-21diff-merges: revise revs->diff flag handlingSergey Organov-3/+1
2020-12-21diff-merges: handle imply -p on -c/--cc logic for log.cSergey Organov-0/+5
2020-12-21diff-merges: introduce revs->first_parent_merges flagSergey Organov-0/+2
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov-2/+14
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov-2/+15
2020-12-21diff-merges: re-arrange functions to match the order they are called inSergey Organov-10/+14
2020-12-21diff-merges: rename diff_merges_default_to_enable() to match semanticsSergey Organov-1/+1
2020-12-21diff-merges: move checks for first_parent_only out of the moduleSergey Organov-6/+4
2020-12-21diff-merges: rename all functions to have common prefixSergey Organov-5/+5
2020-12-21revision: move diff merges functions to its own diff-merges.cSergey Organov-0/+76