summaryrefslogtreecommitdiff
path: root/diff-merges.c
AgeCommit message (Expand)Author
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder
2021-05-21diff-merges: let "-m" imply "-p"Sergey Organov
2021-05-21diff-merges: rename "combined_imply_patch" to "merges_imply_patch"Sergey Organov
2021-05-21diff-merges: move specific diff-index "-m" handling to diff-indexSergey Organov
2021-04-17diff-merges: introduce log.diffMerges config variableSergey Organov
2021-04-17diff-merges: adapt -m to enable default diff formatSergey Organov
2021-04-17diff-merges: refactor set_diff_merges()Sergey Organov
2021-04-17diff-merges: introduce --diff-merges=onSergey Organov
2020-12-21diff-merges: add '--diff-merges=1' as synonym for 'first-parent'Sergey Organov
2020-12-21diff-merges: add old mnemonic counterparts to --diff-mergesSergey Organov
2020-12-21diff-merges: let new options enable diff without -pSergey Organov
2020-12-21diff-merges: do not imply -p for new optionsSergey Organov
2020-12-21diff-merges: implement new values for --diff-mergesSergey Organov
2020-12-21diff-merges: make -m/-c/--cc explicitly mutually exclusiveSergey Organov
2020-12-21diff-merges: refactor opt settings into separate functionsSergey Organov
2020-12-21diff-merges: get rid of now empty diff_merges_init_revs()Sergey Organov
2020-12-21diff-merges: split 'ignore_merges' fieldSergey Organov
2020-12-21diff-merges: fix -m to properly override -c/--ccSergey Organov
2020-12-21diff-merges: revise revs->diff flag handlingSergey Organov
2020-12-21diff-merges: handle imply -p on -c/--cc logic for log.cSergey Organov
2020-12-21diff-merges: introduce revs->first_parent_merges flagSergey Organov
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov
2020-12-21diff-merges: re-arrange functions to match the order they are called inSergey Organov
2020-12-21diff-merges: rename diff_merges_default_to_enable() to match semanticsSergey Organov
2020-12-21diff-merges: move checks for first_parent_only out of the moduleSergey Organov
2020-12-21diff-merges: rename all functions to have common prefixSergey Organov
2020-12-21revision: move diff merges functions to its own diff-merges.cSergey Organov