summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-21diff-merges: do not imply -p for new optionsLibravatar Sergey Organov2-8/+13
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 Organov3-7/+0
2020-12-21diff-merges: group diff-merge flags next to each other inside 'rev_info'Libravatar Sergey Organov1-2/+3
2020-12-21diff-merges: split 'ignore_merges' fieldLibravatar Sergey Organov3-26/+23
2020-12-21diff-merges: fix -m to properly override -c/--ccLibravatar Sergey Organov2-2/+3
2020-12-21t4013: add tests for -m failing to override -c/--ccLibravatar Sergey Organov3-0/+402
2020-12-21t4013: support test_expect_failure through ':failure' magicLibravatar Sergey Organov1-1/+6
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 Organov2-4/+5
2020-12-21diff-merges: introduce revs->first_parent_merges flagLibravatar Sergey Organov3-2/+5
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Libravatar Sergey Organov4-8/+24
2020-12-21diff-merges: new function diff_merges_suppress()Libravatar Sergey Organov4-4/+21
2020-12-21diff-merges: re-arrange functions to match the order they are called inLibravatar Sergey Organov2-13/+16
2020-12-21diff-merges: rename diff_merges_default_to_enable() to match semanticsLibravatar Sergey Organov3-4/+4
2020-12-21diff-merges: move checks for first_parent_only out of the moduleLibravatar Sergey Organov3-9/+11
2020-12-21diff-merges: rename all functions to have common prefixLibravatar Sergey Organov4-15/+20
2020-12-21revision: move diff merges functions to its own diff-merges.cLibravatar Sergey Organov6-78/+97
2020-12-21revision: provide implementation for diff merges tweaksLibravatar Sergey Organov3-11/+24
2020-12-21revision: factor out initialization of diff-merge related settingsLibravatar Sergey Organov1-1/+8
2020-12-21revision: factor out setup of diff-merge related settingsLibravatar Sergey Organov1-6/+12
2020-12-21revision: factor out parsing of diff-merge related optionsLibravatar Sergey Organov1-27/+40
2020-10-30Second batchLibravatar Junio C Hamano1-0/+5
2020-10-30Merge branch 'js/ci-ghwf-dedup-tests'Libravatar Junio C Hamano1-27/+31
2020-10-30Merge branch 'dl/resurrect-update-for-sha256'Libravatar Junio C Hamano1-7/+6
2020-10-30Merge branch 'cm/t7xxx-cleanup'Libravatar Junio C Hamano3-258/+217
2020-10-30Merge branch 'ct/t0000-use-test-path-is-file'Libravatar Junio C Hamano1-1/+1
2020-10-30Merge branch 'en/t7518-unflake'Libravatar Junio C Hamano1-1/+1
2020-10-29Sync with Git 2.29.2Libravatar Junio C Hamano1-0/+12
2020-10-29Git 2.29.2Libravatar Junio C Hamano3-2/+14
2020-10-29Merge branch 'cc/doc-filter-branch-typofix' into maintLibravatar Junio C Hamano1-1/+1
2020-10-29Merge branch 'jk/committer-date-is-author-date-fix' into maintLibravatar Junio C Hamano3-5/+5
2020-10-27First batchLibravatar Junio C Hamano1-0/+38
2020-10-27Merge branch 'dl/checkout-guess'Libravatar Junio C Hamano8-20/+109
2020-10-27Merge branch 'dl/checkout-p-merge-base'Libravatar Junio C Hamano7-1/+56
2020-10-27Merge branch 'sb/clone-origin'Libravatar Junio C Hamano9-23/+158
2020-10-27Merge branch 'sk/force-if-includes'Libravatar Junio C Hamano15-18/+447
2020-10-27Merge branch 'ds/maintenance-part-2'Libravatar Junio C Hamano9-22/+603
2020-10-27Merge branch 'rs/worktree-list-show-locked'Libravatar Junio C Hamano3-3/+17
2020-10-27Merge branch 'rs/tighten-callers-of-deref-tag'Libravatar Junio C Hamano4-4/+17
2020-10-27Merge branch 'rs/dist-doc-with-git-archive'Libravatar Junio C Hamano1-6/+11
2020-10-27Merge branch 'cw/ci-ghwf-check-ws-errors'Libravatar Junio C Hamano1-0/+69
2020-10-27Merge branch 'sd/userdiff-css-update'Libravatar Junio C Hamano6-1/+27
2020-10-27Merge branch 'rk/completion-stash'Libravatar Junio C Hamano1-4/+6
2020-10-27Merge branch 'kb/userdiff-rust-macro-rules'Libravatar Junio C Hamano2-1/+7
2020-10-27Merge branch 'js/userdiff-php'Libravatar Junio C Hamano3-1/+15
2020-10-26other small fixes for 2.29.2Libravatar Junio C Hamano2-1/+23
2020-10-26Merge branch 'cc/doc-filter-branch-typofix'Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 00:07:47 +0000