summaryrefslogtreecommitdiff
path: root/diff-merges.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-25Merge branch 'ja/i18n-common-messages'Libravatar Junio C Hamano1-1/+1
2022-02-04i18n: factorize "invalid value" messagesLibravatar Jean-Noël Avila1-1/+1
2022-02-02diff-merges: avoid history simplifications when diffing mergesLibravatar Elijah Newren1-0/+2
2022-02-02show, log: provide a --remerge-diff capabilityLibravatar Elijah Newren1-0/+12
2021-09-07diff-index: restore -c/--cc options handlingLibravatar Sergey Organov1-10/+4
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Libravatar Jonathan Nieder1-1/+0
2021-05-21diff-merges: let "-m" imply "-p"Libravatar Sergey Organov1-0/+1
2021-05-21diff-merges: rename "combined_imply_patch" to "merges_imply_patch"Libravatar Sergey Organov1-5/+5
2021-05-21diff-merges: move specific diff-index "-m" handling to diff-indexLibravatar Sergey Organov1-12/+13
2021-04-16diff-merges: introduce log.diffMerges config variableLibravatar Sergey Organov1-0/+11
2021-04-16diff-merges: adapt -m to enable default diff formatLibravatar Sergey Organov1-4/+4
2021-04-16diff-merges: refactor set_diff_merges()Libravatar Sergey Organov1-15/+21
2021-04-16diff-merges: introduce --diff-merges=onLibravatar Sergey Organov1-0/+7
2020-12-21diff-merges: add '--diff-merges=1' as synonym for 'first-parent'Libravatar Sergey Organov1-1/+1
2020-12-21diff-merges: add old mnemonic counterparts to --diff-mergesLibravatar Sergey Organov1-3/+3
2020-12-21diff-merges: let new options enable diff without -pLibravatar Sergey Organov1-5/+12
2020-12-21diff-merges: do not imply -p for new optionsLibravatar Sergey Organov1-8/+12
2020-12-21diff-merges: implement new values for --diff-mergesLibravatar Sergey Organov1-3/+16
2020-12-21diff-merges: make -m/-c/--cc explicitly mutually exclusiveLibravatar Sergey Organov1-0/+3
2020-12-21diff-merges: refactor opt settings into separate functionsLibravatar Sergey Organov1-22/+41
2020-12-21diff-merges: get rid of now empty diff_merges_init_revs()Libravatar Sergey Organov1-4/+0
2020-12-21diff-merges: split 'ignore_merges' fieldLibravatar Sergey Organov1-18/+13
2020-12-21diff-merges: fix -m to properly override -c/--ccLibravatar Sergey Organov1-0/+1
2020-12-21diff-merges: revise revs->diff flag handlingLibravatar Sergey Organov1-3/+1
2020-12-21diff-merges: handle imply -p on -c/--cc logic for log.cLibravatar Sergey Organov1-0/+5
2020-12-21diff-merges: introduce revs->first_parent_merges flagLibravatar Sergey Organov1-0/+2
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Libravatar Sergey Organov1-2/+14
2020-12-21diff-merges: new function diff_merges_suppress()Libravatar Sergey Organov1-2/+15
2020-12-21diff-merges: re-arrange functions to match the order they are called inLibravatar Sergey Organov1-10/+14
2020-12-21diff-merges: rename diff_merges_default_to_enable() to match semanticsLibravatar Sergey Organov1-1/+1
2020-12-21diff-merges: move checks for first_parent_only out of the moduleLibravatar Sergey Organov1-6/+4
2020-12-21diff-merges: rename all functions to have common prefixLibravatar Sergey Organov1-5/+5
2020-12-21revision: move diff merges functions to its own diff-merges.cLibravatar Sergey Organov1-0/+76