summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-16t/perf: fix test_export() failure with BSD `sed`Libravatar Eric Sunshine1-2/+7
2020-12-16l10n: tr: v2.30.0-r1Libravatar Emir Sarı1-2410/+2506
2020-12-15pull: display default warning only when non-ffLibravatar Felipe Contreras2-7/+66
2020-12-15pull: correct condition to trigger non-ff adviceLibravatar Junio C Hamano1-13/+19
2020-12-15pull: get rid of unnecessary global variableLibravatar Junio C Hamano1-6/+5
2020-12-15style: do not "break" in switch() after "return"Libravatar Ævar Arnfjörð Bjarmason2-3/+0
2020-12-15compat-util: pretend that stub setitimer() always succeedsLibravatar Junio C Hamano1-1/+1
2020-12-15strmap: make callers of strmap_remove() to call it in void contextLibravatar Junio C Hamano1-2/+2
2020-12-15l10n: sv.po: Update Swedish translation (5038t0f0u)Libravatar Peter Krefting1-2332/+2532
2020-12-15l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)Libravatar Jiang Xin1-2276/+2375
2020-12-14doc: mention Python 3.x supportsLibravatar Đoàn Trần Công Danh2-3/+2
2020-12-14Git 2.30-rc0Libravatar Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Libravatar Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Libravatar Junio C Hamano1-4/+11
2020-12-14Merge branch 'da/vs-build-iconv-fix'Libravatar Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Libravatar Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Libravatar Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Libravatar Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Libravatar Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Libravatar Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Libravatar Junio C Hamano3-18/+52
2020-12-14pull: give the advice for choosing rebase/merge much laterLibravatar Felipe Contreras1-14/+18
2020-12-14pull: refactor fast-forward checkLibravatar Felipe Contreras1-11/+15
2020-12-14index-format.txt: document v2 format of file system monitor extensionLibravatar Jeff Hostetler1-2/+8
2020-12-14docs: multi-pack-index: remove note about future 'verify' workLibravatar Johannes Berg1-4/+0
2020-12-13init: provide useful advice about init.defaultBranchLibravatar Johannes Schindelin4-4/+29
2020-12-13get_default_branch_name(): prepare for showing some adviceLibravatar Johannes Schindelin5-11/+14
2020-12-13branch -m: allow renaming a yet-unborn branchLibravatar Johannes Schindelin2-1/+11
2020-12-13init: document `init.defaultBranch` betterLibravatar Johannes Schindelin1-4/+7
2020-12-13merge-ort: add modify/delete handling and delayed output processingLibravatar Elijah Newren1-2/+98
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionLibravatar Elijah Newren1-0/+14
2020-12-13merge-ort: add function grouping commentsLibravatar Elijah Newren1-0/+21
2020-12-13merge-ort: add a paths_to_free field to merge_options_internalLibravatar Elijah Newren1-1/+25
2020-12-13merge-ort: add a path_conflict field to merge_options_internalLibravatar Elijah Newren1-0/+7
2020-12-13merge-ort: add a clear_internal_opts helperLibravatar Elijah Newren1-16/+24
2020-12-13merge-ort: add a few includesLibravatar Elijah Newren1-0/+2
2020-12-13merge-ort: free data structures in merge_finalize()Libravatar Elijah Newren1-1/+31
2020-12-13merge-ort: add implementation of record_conflicted_index_entries()Libravatar Elijah Newren1-1/+87
2020-12-13tree: enable cmp_cache_name_compare() to be used elsewhereLibravatar Elijah Newren2-1/+3
2020-12-13merge-ort: add implementation of checkout()Libravatar Elijah Newren1-1/+44
2020-12-13merge-ort: basic outline for merge_switch_to_result()Libravatar Elijah Newren1-1/+41
2020-12-13merge-ort: step 3 of tree writing -- handling subdirectories as we goLibravatar Elijah Newren1-8/+234
2020-12-13merge-ort: step 2 of tree writing -- function to create tree objectLibravatar Elijah Newren1-1/+66
2020-12-13merge-ort: step 1 of tree writing -- record basenames, modes, and oidsLibravatar Elijah Newren1-3/+37
2020-12-13merge-ort: have process_entries operate in a defined orderLibravatar Elijah Newren1-3/+50
2020-12-13merge-ort: add a preliminary simple process_entries() implementationLibravatar Elijah Newren1-1/+102
2020-12-13merge-ort: avoid recursing into identical treesLibravatar Elijah Newren1-0/+13
2020-12-13merge-ort: record stage and auxiliary info for every pathLibravatar Elijah Newren1-7/+90
2020-12-13merge-ort: compute a few more useful fields for collect_merge_infoLibravatar Elijah Newren1-0/+36
2020-12-13merge-ort: avoid repeating fill_tree_descriptor() on the same treeLibravatar Elijah Newren1-4/+22
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 23:43:50 +0000