summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-07-22Merge branch 'jk/typofix'Libravatar Junio C Hamano1-1/+1
2021-07-22SubmittingPatches: replace discussion of Travis with GitHub ActionsLibravatar Ævar Arnfjörð Bjarmason1-32/+17
2021-07-22SubmittingPatches: move discussion of Signed-off-by above "send"Libravatar Ævar Arnfjörð Bjarmason1-79/+79
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren2-5/+15
2021-07-22pull: update docs & code for option compatibility with rebasingLibravatar Elijah Newren4-5/+48
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren13-78/+84
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren2-3/+17
2021-07-22pull: since --ff-only overrides, handle it firstLibravatar Elijah Newren1-8/+8
2021-07-21doc: pull: fix rebase=false documentationLibravatar Felipe Contreras1-1/+1
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie5-9/+20
2021-07-20t7601: add tests of interactions with multiple merge heads and configLibravatar Elijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsLibravatar Elijah Newren1-0/+182
2021-07-20pack-bitmap: clarify comment in filter_bitmap_exclude_type()Libravatar Taylor Blau1-5/+6
2021-07-20unpack-trees: resolve sparse-directory/file conflictsLibravatar Derrick Stolee2-12/+23
2021-07-20t1092: document bad 'git checkout' behaviorLibravatar Derrick Stolee1-2/+140
2021-07-20doc: clarify description of 'submodule.recurse'Libravatar Philippe Blain1-2/+3
2021-07-20doc/git-config: simplify "override" advice for FILES sectionLibravatar Jeff King1-5/+4
2021-07-20doc/git-config: clarify GIT_CONFIG environment variableLibravatar Jeff King1-5/+6
2021-07-20doc/git-config: explain --file instead of referring to GIT_CONFIGLibravatar Jeff King1-1/+7
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costLibravatar Elijah Newren2-7/+87
2021-07-20merge-ort: avoid recursing into directories when we don't need toLibravatar Elijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedLibravatar Elijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionLibravatar Elijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesLibravatar Elijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Libravatar Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationLibravatar Elijah Newren1-0/+37
2021-07-20t0000: fix test if run with TEST_OUTPUT_DIRECTORYLibravatar Patrick Steinhardt2-2/+14
2021-07-19multi-pack-index: fix potential segfault without sub-commandLibravatar Taylor Blau2-1/+6
2021-07-19refs/debug: quote prefixLibravatar Han-Wen Nienhuys1-1/+2
2021-07-19t0000: clear GIT_SKIP_TESTS before running sub-testsLibravatar Jeff King1-10/+29
2021-07-19test-lib-functions: use test-tool for [de]packetize()Libravatar Ævar Arnfjörð Bjarmason5-34/+24
2021-07-16The fifth batchLibravatar Junio C Hamano1-0/+29
2021-07-16Merge branch 'ds/gender-neutral-doc'Libravatar Junio C Hamano11-16/+14
2021-07-16Merge branch 'jt/partial-clone-submodule-1'Libravatar Junio C Hamano14-82/+196
2021-07-16Merge branch 'ab/struct-init'Libravatar Junio C Hamano29-64/+76
2021-07-16Merge branch 'dd/test-stdout-count-lines'Libravatar Junio C Hamano3-76/+98
2021-07-16Merge branch 'hn/refs-test-cleanup'Libravatar Junio C Hamano2-8/+6
2021-07-16Merge branch 'rs/khash-alloc-cleanup'Libravatar Junio C Hamano1-9/+5
2021-07-16Merge branch 'ar/help-micro-cleanup'Libravatar Junio C Hamano1-9/+8
2021-07-16Merge branch 'ar/submodule-helper-include-cleanup'Libravatar Junio C Hamano1-1/+0
2021-07-16Merge branch 'ab/bundle-updates'Libravatar Junio C Hamano4-65/+104
2021-07-16Merge branch 'hn/refs-iterator-peel-returns-boolean'Libravatar Junio C Hamano4-3/+6
2021-07-16Merge branch 'ab/mktag-tests'Libravatar Junio C Hamano1-15/+106
2021-07-16Merge branch 'ab/show-branch-tests'Libravatar Junio C Hamano3-73/+155
2021-07-16Merge branch 'ab/fetch-negotiate-segv-fix'Libravatar Junio C Hamano5-8/+38
2021-07-16Merge branch 'ab/make-delete-on-error'Libravatar Junio C Hamano1-11/+18
2021-07-16Merge branch 'ew/mmap-failures'Libravatar Junio C Hamano5-5/+22
2021-07-16Merge branch 'js/config-mak-windows-pcre-fix'Libravatar Junio C Hamano1-1/+1
2021-07-16Merge branch 'js/gfw-system-config-loc-fix'Libravatar Junio C Hamano3-7/+21
2021-07-16Merge branch 'ks/submodule-cleanup'Libravatar Junio C Hamano1-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:37:08 +0000