summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2020-12-21revision: provide implementation for diff merges tweaksSergey Organov
2020-12-21revision: factor out initialization of diff-merge related settingsSergey Organov
2020-12-21revision: factor out setup of diff-merge related settingsSergey Organov
2020-12-21revision: factor out parsing of diff-merge related optionsSergey Organov
2020-10-30Second batchJunio C Hamano
2020-10-30Merge branch 'js/ci-ghwf-dedup-tests'Junio C Hamano
2020-10-30Merge branch 'dl/resurrect-update-for-sha256'Junio C Hamano
2020-10-30Merge branch 'cm/t7xxx-cleanup'Junio C Hamano
2020-10-30Merge branch 'ct/t0000-use-test-path-is-file'Junio C Hamano
2020-10-30Merge branch 'en/t7518-unflake'Junio C Hamano
2020-10-29Sync with Git 2.29.2Junio C Hamano
2020-10-29Git 2.29.2v2.29.2Junio C Hamano
2020-10-29Merge branch 'cc/doc-filter-branch-typofix' into maintJunio C Hamano
2020-10-29Merge branch 'jk/committer-date-is-author-date-fix' into maintJunio C Hamano
2020-10-27First batchJunio C Hamano
2020-10-27Merge branch 'dl/checkout-guess'Junio C Hamano
2020-10-27Merge branch 'dl/checkout-p-merge-base'Junio C Hamano
2020-10-27Merge branch 'sb/clone-origin'Junio C Hamano
2020-10-27Merge branch 'sk/force-if-includes'Junio C Hamano
2020-10-27Merge branch 'ds/maintenance-part-2'Junio C Hamano
2020-10-27Merge branch 'rs/worktree-list-show-locked'Junio C Hamano
2020-10-27Merge branch 'rs/tighten-callers-of-deref-tag'Junio C Hamano
2020-10-27Merge branch 'rs/dist-doc-with-git-archive'Junio C Hamano
2020-10-27Merge branch 'cw/ci-ghwf-check-ws-errors'Junio C Hamano
2020-10-27Merge branch 'sd/userdiff-css-update'Junio C Hamano
2020-10-27Merge branch 'rk/completion-stash'Junio C Hamano
2020-10-27Merge branch 'kb/userdiff-rust-macro-rules'Junio C Hamano
2020-10-27Merge branch 'js/userdiff-php'Junio C Hamano
2020-10-26other small fixes for 2.29.2Junio C Hamano
2020-10-26Merge branch 'cc/doc-filter-branch-typofix'Junio C Hamano
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano
2020-10-23rebase: fix broken email with --committer-date-is-author-dateJeff King
2020-10-23am: fix broken email with --committer-date-is-author-dateJeff King
2020-10-23t3436: check --committer-date-is-author-date result more carefullyJeff King
2020-10-22Sync with Git 2.29.1Junio C Hamano
2020-10-22Git 2.29.1v2.29.1Junio C Hamano
2020-10-22Merge branch 'js/no-builtins-on-disk-option' into maintJunio C Hamano
2020-10-22t7102: prepare expected output inside test_expect_* blockJunio C Hamano
2020-10-22t7201: put each command on a separate lineCharvi Mendiratta
2020-10-22t7201: use 'git -C' to avoid subshellCharvi Mendiratta
2020-10-22t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta
2020-10-21SKIP_DASHED_BUILT_INS: do not skip the bin/ programsJohannes Schindelin
2020-10-20t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta