summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-07-26ref-filter: --format=%(raw) support --perlZheNing Hu5-8/+48
2021-07-26ref-filter: add %(raw) atomZheNing Hu3-28/+340
2021-07-26ref-filter: add obj-type check in grab contentsZheNing Hu1-9/+15
2021-07-23merge: apply autostash if merge strategy failsPhilippe Blain2-0/+9
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain2-0/+12
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Philippe Blain1-1/+2
2021-07-23merge: add missing word "strategy" to a messagePhilippe Blain1-1/+1
2021-07-23cache-tree: prefetch in partial clone read-treeJonathan Tan2-2/+42
2021-07-23unpack-trees: refactor prefetching codeJonathan Tan3-19/+40
2021-07-23pack-bitmap: check pack validity when opening bitmapJeff King1-0/+5
2021-07-22tr2: log parent process nameEmily Shaffer12-1/+168
2021-07-22tr2: make process info collection platform-genericEmily Shaffer4-6/+16
2021-07-22bundle tests: use test_cmp instead of grepÆvar Arnfjörð Bjarmason1-13/+53
2021-07-22bundle tests: use ">file" not ": >file"Ævar Arnfjörð Bjarmason1-3/+3
2021-07-22The sixth batchJunio C Hamano1-0/+10
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Junio C Hamano4-12/+112
2021-07-22Merge branch 'ab/imap-send-read-everything-simplify'Junio C Hamano1-14/+2
2021-07-22Merge branch 'ab/gitignore-discovery-doc'Junio C Hamano1-6/+5
2021-07-22Merge branch 'js/ci-windows-update'Junio C Hamano2-112/+50
2021-07-22Merge branch 'ab/send-email-optim'Junio C Hamano4-79/+159
2021-07-22Merge branch 'jk/typofix'Junio C Hamano1-1/+1
2021-07-22SubmittingPatches: replace discussion of Travis with GitHub ActionsÆvar Arnfjörð Bjarmason1-31/+16
2021-07-22SubmittingPatches: move discussion of Signed-off-by above "send"Ævar Arnfjörð Bjarmason1-79/+79
2021-07-22pull: fix handling of multiple headsElijah Newren2-5/+15
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren4-5/+48
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren13-77/+83
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren2-3/+17
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren1-8/+8
2021-07-22Makefile: don't use "FORCE" for tags targetsÆvar Arnfjörð Bjarmason1-8/+12
2021-07-21doc: pull: fix rebase=false documentationFelipe Contreras1-1/+1
2021-07-21test-lib tests: move "run_sub_test" to a new lib-subtest.shÆvar Arnfjörð Bjarmason2-87/+87
2021-07-21Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtestJunio C Hamano2-2/+14
2021-07-21Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtestJunio C Hamano1-10/+29
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie5-9/+20
2021-07-20t7601: add tests of interactions with multiple merge heads and configElijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren1-0/+182
2021-07-20pack-bitmap: clarify comment in filter_bitmap_exclude_type()Taylor Blau1-5/+6
2021-07-20unpack-trees: resolve sparse-directory/file conflictsDerrick Stolee2-12/+23
2021-07-20t1092: document bad 'git checkout' behaviorDerrick Stolee1-2/+140
2021-07-20doc: clarify description of 'submodule.recurse'Philippe Blain1-2/+3
2021-07-20doc/git-config: simplify "override" advice for FILES sectionJeff King1-5/+4
2021-07-20doc/git-config: clarify GIT_CONFIG environment variableJeff King1-5/+6
2021-07-20doc/git-config: explain --file instead of referring to GIT_CONFIGJeff King1-1/+7
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren2-7/+87
2021-07-20merge-ort: avoid recursing into directories when we don't need toElijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedElijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionElijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesElijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationElijah Newren1-0/+37