summaryrefslogtreecommitdiff
path: root/diff-merges.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-251-1/+1
|\
| * i18n: factorize "invalid value" messagesJean-Noël Avila2022-02-041-1/+1
* | diff-merges: avoid history simplifications when diffing mergesElijah Newren2022-02-021-0/+2
* | show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-0/+12
|/
* diff-index: restore -c/--cc options handlingSergey Organov2021-09-071-10/+4
* Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder2021-08-091-1/+0
* diff-merges: let "-m" imply "-p"Sergey Organov2021-05-211-0/+1
* diff-merges: rename "combined_imply_patch" to "merges_imply_patch"Sergey Organov2021-05-211-5/+5
* diff-merges: move specific diff-index "-m" handling to diff-indexSergey Organov2021-05-211-12/+13
* diff-merges: introduce log.diffMerges config variableSergey Organov2021-04-161-0/+11
* diff-merges: adapt -m to enable default diff formatSergey Organov2021-04-161-4/+4
* diff-merges: refactor set_diff_merges()Sergey Organov2021-04-161-15/+21
* diff-merges: introduce --diff-merges=onSergey Organov2021-04-161-0/+7
* diff-merges: add '--diff-merges=1' as synonym for 'first-parent'Sergey Organov2020-12-211-1/+1
* diff-merges: add old mnemonic counterparts to --diff-mergesSergey Organov2020-12-211-3/+3
* diff-merges: let new options enable diff without -pSergey Organov2020-12-211-5/+12
* diff-merges: do not imply -p for new optionsSergey Organov2020-12-211-8/+12
* diff-merges: implement new values for --diff-mergesSergey Organov2020-12-211-3/+16
* diff-merges: make -m/-c/--cc explicitly mutually exclusiveSergey Organov2020-12-211-0/+3
* diff-merges: refactor opt settings into separate functionsSergey Organov2020-12-211-22/+41
* diff-merges: get rid of now empty diff_merges_init_revs()Sergey Organov2020-12-211-4/+0
* diff-merges: split 'ignore_merges' fieldSergey Organov2020-12-211-18/+13
* diff-merges: fix -m to properly override -c/--ccSergey Organov2020-12-211-0/+1
* diff-merges: revise revs->diff flag handlingSergey Organov2020-12-211-3/+1
* diff-merges: handle imply -p on -c/--cc logic for log.cSergey Organov2020-12-211-0/+5
* diff-merges: introduce revs->first_parent_merges flagSergey Organov2020-12-211-0/+2
* diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov2020-12-211-2/+14
* diff-merges: new function diff_merges_suppress()Sergey Organov2020-12-211-2/+15
* diff-merges: re-arrange functions to match the order they are called inSergey Organov2020-12-211-10/+14
* diff-merges: rename diff_merges_default_to_enable() to match semanticsSergey Organov2020-12-211-1/+1
* diff-merges: move checks for first_parent_only out of the moduleSergey Organov2020-12-211-6/+4
* diff-merges: rename all functions to have common prefixSergey Organov2020-12-211-5/+5
* revision: move diff merges functions to its own diff-merges.cSergey Organov2020-12-211-0/+76
View Lorry Controller Status