summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorLines
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain-0/+12
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Philippe Blain-1/+2
2021-07-23merge: add missing word "strategy" to a messagePhilippe Blain-1/+1
2021-07-23cache-tree: prefetch in partial clone read-treeJonathan Tan-2/+42
2021-07-23unpack-trees: refactor prefetching codeJonathan Tan-19/+40
2021-07-23pack-bitmap: check pack validity when opening bitmapJeff King-0/+5
2021-07-22tr2: log parent process nameEmily Shaffer-1/+168
2021-07-22tr2: make process info collection platform-genericEmily Shaffer-6/+16
2021-07-22bundle tests: use test_cmp instead of grepÆvar Arnfjörð Bjarmason-13/+53
2021-07-22bundle tests: use ">file" not ": >file"Ævar Arnfjörð Bjarmason-3/+3
2021-07-22The sixth batchJunio C Hamano-0/+10
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Junio C Hamano-12/+112
2021-07-22Merge branch 'ab/imap-send-read-everything-simplify'Junio C Hamano-14/+2
2021-07-22Merge branch 'ab/gitignore-discovery-doc'Junio C Hamano-6/+5
2021-07-22Merge branch 'js/ci-windows-update'Junio C Hamano-112/+50
2021-07-22Merge branch 'ab/send-email-optim'Junio C Hamano-79/+159
2021-07-22Merge branch 'jk/typofix'Junio C Hamano-1/+1
2021-07-22SubmittingPatches: replace discussion of Travis with GitHub ActionsÆvar Arnfjörð Bjarmason-32/+17
2021-07-22SubmittingPatches: move discussion of Signed-off-by above "send"Ævar Arnfjörð Bjarmason-79/+79
2021-07-22pull: fix handling of multiple headsElijah Newren-5/+15
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren-5/+48
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren-78/+84
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren-3/+17
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren-8/+8
2021-07-22Makefile: don't use "FORCE" for tags targetsÆvar Arnfjörð Bjarmason-8/+12
2021-07-21doc: pull: fix rebase=false documentationFelipe Contreras-1/+1
2021-07-21test-lib tests: move "run_sub_test" to a new lib-subtest.shÆvar Arnfjörð Bjarmason-87/+87
2021-07-21Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtestJunio C Hamano-2/+14
2021-07-21Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtestJunio C Hamano-10/+29
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie-9/+20
2021-07-20t7601: add tests of interactions with multiple merge heads and configElijah Newren-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren-0/+182
2021-07-20pack-bitmap: clarify comment in filter_bitmap_exclude_type()Taylor Blau-5/+6
2021-07-20unpack-trees: resolve sparse-directory/file conflictsDerrick Stolee-12/+23
2021-07-20t1092: document bad 'git checkout' behaviorDerrick Stolee-2/+140
2021-07-20doc: clarify description of 'submodule.recurse'Philippe Blain-2/+3
2021-07-20doc/git-config: simplify "override" advice for FILES sectionJeff King-5/+4
2021-07-20doc/git-config: clarify GIT_CONFIG environment variableJeff King-5/+6
2021-07-20doc/git-config: explain --file instead of referring to GIT_CONFIGJeff King-1/+7
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren-7/+87
2021-07-20merge-ort: avoid recursing into directories when we don't need toElijah Newren-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedElijah Newren-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionElijah Newren-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesElijah Newren-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationElijah Newren-0/+37
2021-07-20t0000: fix test if run with TEST_OUTPUT_DIRECTORYPatrick Steinhardt-2/+14
2021-07-19multi-pack-index: fix potential segfault without sub-commandTaylor Blau-1/+6
2021-07-19refs/debug: quote prefixHan-Wen Nienhuys-1/+2
2021-07-19t0000: clear GIT_SKIP_TESTS before running sub-testsJeff King-10/+29
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-03 21:15:14 +0000