summaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2022-06-21fetch: stop passing around unused worktrees variableJeff King1-15/+9
2022-06-15branch: fix branch_checked_out() leaksDerrick Stolee2-10/+43
2022-06-15branch: use branch_checked_out() when deleting refsDerrick Stolee2-5/+7
2022-06-15fetch: use new branch_checked_out() and add testsDerrick Stolee2-14/+55
2022-06-15branch: check for bisects and rebasesDerrick Stolee2-8/+49
2022-06-15branch: add branch_checked_out() helperDerrick Stolee3-0/+72
2022-05-23Second batchJunio C Hamano1-0/+10
2022-05-21First batch for 2.37Junio C Hamano1-0/+56
2022-05-16fetch: limit shared symref check only for local branchesOrgad Shaneh1-0/+1
2022-05-16fetch-pack: make unexpected peek result non-fatalJonathan Tan1-8/+11
2022-05-13MyFirstContribution: drop PR description for GGG single-patch contributionsPhilippe Blain1-0/+10
2022-05-13MyFirstContribution: reference "The cover letter" in GitGitGadget sectionPhilippe Blain1-2/+6
2022-05-13MyFirstContribution: reference "The cover letter" in "Preparing Email"Philippe Blain1-29/+9
2022-05-13MyFirstContribution: add standalone section on cover letterPhilippe Blain1-4/+47
2022-05-13MyFirstContribution: add "Anatomy of a Patch Series" sectionPhilippe Blain1-3/+51
2022-05-13commit: fix "author_ident" leakJunio C Hamano3-3/+8
2022-05-13ci: use https, not http to download binaries from perforce.comÆvar Arnfjörð Bjarmason1-1/+1
2022-05-13ci: reintroduce prevention from perforce being quarantined in macOSCarlo Marcelo Arenas Belón1-1/+2
2022-05-13ci: avoid brew for installing perforceCarlo Marcelo Arenas Belón1-7/+8
2022-05-13ci: make failure to find perforce more user friendlyCarlo Marcelo Arenas Belón1-2/+6
2022-05-13commit-graph.c: don't assume that stat() succeedsÆvar Arnfjörð Bjarmason1-2/+4
2022-05-13object-file: fix a unpack_loose_header() regression in 3b6a8db3b03Ævar Arnfjörð Bjarmason3-6/+25
2022-05-13log test: skip a failing mkstemp() test under valgrindÆvar Arnfjörð Bjarmason1-4/+7
2022-05-13tests: using custom GIT_EXEC_PATH breaks --valgrind testsÆvar Arnfjörð Bjarmason2-2/+3
2022-05-12archive: do not let on-disk mode leak to zip archivesJunio C Hamano1-1/+1
2022-05-12pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo2-3/+33
2022-05-11second 0th batch of topics from the previous cycleJunio C Hamano1-0/+16
2022-05-11bisect: output bisect setup status in bisect logChris Down2-5/+31
2022-05-11bisect: output state before we are ready to compute bisectionChris Down3-13/+67
2022-05-11SubmittingPatches: use more stable git.ozlabs.org URLJunio C Hamano1-1/+4
2022-05-11gitk: include y coord in recorded sash positionhalilsen1-0/+3
2022-05-11gitk: trivial indentation fixhalilsen1-7/+7
2022-05-110th batch for topics from the previous cycleJunio C Hamano1-1/+22
2022-05-11unpack-trees: preserve index sparsityVictoria Dye2-1/+7
2022-05-11stash: apply stash using 'merge_ort_nonrecursive()'Victoria Dye2-8/+26
2022-05-11read-cache: set sparsity when index is newVictoria Dye2-2/+18
2022-05-11sparse-index: expose 'is_sparse_index_allowed()'Victoria Dye2-1/+2
2022-05-11stash: integrate with sparse indexVictoria Dye2-1/+31
2022-05-11stash: expand sparse-checkout compatibility testingVictoria Dye2-0/+51
2022-05-09detect-compiler: make detection independent of localeMichael J Gruber1-1/+1
2022-05-05Git 2.36.1v2.36.1Junio C Hamano3-2/+35
2022-05-04trace2 docs: add missing full stopJohannes Schindelin1-1/+1
2022-05-04trace2 docs: clarify what `varargs` is all aboutJohannes Schindelin1-1/+1
2022-05-04trace2 docs: fix a JSON formatted exampleJohannes Schindelin1-1/+1
2022-05-04trace2 docs: surround more terms in backticksJohannes Schindelin1-7/+7
2022-05-04trace2 docs: "printf" is not an English wordJohannes Schindelin1-6/+6
2022-05-04trace2 docs: a couple of grammar fixesJohannes Schindelin1-8/+8
2022-05-04git-p4: improve encoding handling to support inconsistent encodingsTao Klerks5-18/+572
2022-05-04A bit more regression fixes for 2.36Junio C Hamano1-0/+34
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano2-2/+2