summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-23Merge branch 'nk/refspecs-negative-fix'Junio C Hamano2-3/+64
2020-12-23Merge branch 'ma/maintenance-crontab-fix'Junio C Hamano3-5/+20
2020-12-23Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2-2/+9
2020-12-23Merge branch 'js/no-more-prepare-for-main-in-test'Junio C Hamano11-619/+621
2020-12-23Merge branch 'jx/pack-redundant-on-single-pack'Junio C Hamano2-4/+39
2020-12-23l10n: pl.po: started Polish translationm4sk1n1-0/+12579
2020-12-23git-p4: fix syncing file types with patternDaniel Levin1-1/+1
2020-12-23core.abbrev=no disables abbreviationsEric Wong3-0/+6
2020-12-23l10n: de.po: Update German translation for Git 2.30.0Matthias Rüster1-2600/+2729
2020-12-22mktag doc: grammar fix, when exists -> when it existsÆvar Arnfjörð Bjarmason1-1/+1
2020-12-22mktag doc: say <hash> not <sha1>Ævar Arnfjörð Bjarmason1-1/+1
2020-12-23Merge branch 'master' of github.com:Softcatala/git-poJiang Xin1-1082/+755
2020-12-22t/perf: avoid unnecessary test_export() recursionEric Sunshine1-4/+1
2020-12-22git.txt: fix typos in 'linkgit' macro invocationPhilippe Blain1-2/+2
2020-12-22l10n: Update Catalan translationJordi Mas1-1082/+755
2020-12-22l10n: bg.po: Updated Bulgarian translation (5037t)Alexander Shopov1-2480/+2600
2020-12-21negative-refspec: improve comment on query_matches_negative_refspecNipunn Koorapati1-0/+6
2020-12-21negative-refspec: fix segfault on : refspecNipunn Koorapati2-3/+58
2020-12-22Merge branch 'fr_2.30_rnd2' of github.com:jnavila/gitJiang Xin1-382/+419
2020-12-21t7900-maintenance: test for magic markersMartin Ågren1-0/+9
2020-12-21gc: fix handling of crontab magic markersMartin Ågren2-4/+10
2020-12-21git-maintenance.txt: add missing wordMartin Ågren1-1/+1
2020-12-21checkout -p: handle tree arguments correctly againJohannes Schindelin2-2/+9
2020-12-21t4013: add tests for --diff-merges=first-parentSergey Organov3-0/+195
2020-12-21doc/git-show: include --diff-merges descriptionSergey Organov3-52/+57
2020-12-21doc/rev-list-options: document --first-parent changes merges formatSergey Organov1-0/+5
2020-12-21doc/diff-generate-patch: mention new --diff-merges optionSergey Organov1-3/+3
2020-12-21doc/git-log: describe new --diff-merges optionsSergey Organov1-33/+50
2020-12-21diff-merges: add '--diff-merges=1' as synonym for 'first-parent'Sergey Organov1-1/+1
2020-12-21diff-merges: add old mnemonic counterparts to --diff-mergesSergey Organov1-3/+3
2020-12-21diff-merges: let new options enable diff without -pSergey Organov3-9/+22
2020-12-21diff-merges: do not imply -p for new optionsSergey Organov2-8/+13
2020-12-21diff-merges: implement new values for --diff-mergesSergey Organov1-3/+16
2020-12-21diff-merges: make -m/-c/--cc explicitly mutually exclusiveSergey Organov1-0/+3
2020-12-21diff-merges: refactor opt settings into separate functionsSergey Organov1-22/+41
2020-12-21diff-merges: get rid of now empty diff_merges_init_revs()Sergey Organov3-7/+0
2020-12-21diff-merges: group diff-merge flags next to each other inside 'rev_info'Sergey Organov1-2/+3
2020-12-21diff-merges: split 'ignore_merges' fieldSergey Organov3-26/+23
2020-12-21diff-merges: fix -m to properly override -c/--ccSergey Organov2-2/+3
2020-12-21t4013: add tests for -m failing to override -c/--ccSergey Organov3-0/+402
2020-12-21t4013: support test_expect_failure through ':failure' magicSergey Organov1-1/+6
2020-12-21diff-merges: revise revs->diff flag handlingSergey Organov1-3/+1
2020-12-21diff-merges: handle imply -p on -c/--cc logic for log.cSergey Organov2-4/+5
2020-12-21diff-merges: introduce revs->first_parent_merges flagSergey Organov3-2/+5
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov4-8/+24
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov4-4/+21
2020-12-21diff-merges: re-arrange functions to match the order they are called inSergey Organov2-13/+16
2020-12-21diff-merges: rename diff_merges_default_to_enable() to match semanticsSergey Organov3-4/+4
2020-12-21diff-merges: move checks for first_parent_only out of the moduleSergey Organov3-9/+11
2020-12-21diff-merges: rename all functions to have common prefixSergey Organov4-15/+20