summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-05-25Merge branch 'mt/init-template-userpath-fix'Junio C Hamano2-9/+22
2021-05-25Merge branch 'jt/send-email-validate-errors-fix'Junio C Hamano1-4/+3
2021-05-25Merge branch 'ab/send-email-validate-errors-fix'Junio C Hamano2-3/+32
2021-05-25t1092: use GIT_PROGRESS_DELAY for consistent resultsDerrick Stolee1-3/+3
2021-05-25init: fix bug regarding ~/ expansion in init.templateDirMatheus Tavares2-9/+22
2021-05-25send-email: fix missing error message regressionÆvar Arnfjörð Bjarmason2-3/+32
2021-05-25t9001-send-email.sh: fix expected absolute paths on WindowsJohannes Sixt1-4/+3
2021-05-25packfile-uri.txt: fix blobPackfileUri descriptionTeng Long1-7/+8
2021-05-24doc: avoid using rm directlyFelipe Contreras1-3/+3
2021-05-24doc: simplify Makefile using .DELETE_ON_ERRORFelipe Contreras1-28/+19
2021-05-24doc: remove unnecessary rm instancesFelipe Contreras1-27/+15
2021-05-24doc: improve asciidoc dependenciesFelipe Contreras1-1/+2
2021-05-24doc: refactor common asciidoc dependenciesFelipe Contreras1-3/+4
2021-05-24l10n: vi.po(5204t): Updated Vietnamese translation for v2.32.0Tran Ngoc Quan1-3196/+3691
2021-05-23l10n: zh_TW.po: localizedYi-Jyun Pan1-82/+82
2021-05-22Git 2.32-rc1v2.32.0-rc1Junio C Hamano2-1/+6
2021-05-22Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano4-9/+10
2021-05-22Merge branch 'jh/simple-ipc-sans-pthread'Junio C Hamano6-14/+48
2021-05-22Merge branch 'wm/rev-parse-path-format-wo-arg'Junio C Hamano2-0/+6
2021-05-22t: use configured TAR instead of tarĐoàn Trần Công Danh2-4/+4
2021-05-22stash show: use stash.showIncludeUntracked even when diff options givenDenton Liu4-9/+10
2021-05-21l10n: zh_TW.po: v2.32.0 round 1 (11 untranslated)Yi-Jyun Pan1-3230/+3714
2021-05-21diff-merges: let "-m" imply "-p"Sergey Organov3-6/+7
2021-05-21diff-merges: rename "combined_imply_patch" to "merges_imply_patch"Sergey Organov2-6/+6
2021-05-21stash list: stop passing "-m" to "git log"Sergey Organov2-2/+2
2021-05-21git-svn: stop passing "-m" to "git rev-list"Sergey Organov1-1/+1
2021-05-21diff-merges: move specific diff-index "-m" handling to diff-indexSergey Organov3-12/+24
2021-05-21t4013: test "git diff-index -m"Sergey Organov1-0/+13
2021-05-21t4013: test "git diff-tree -m"Sergey Organov2-0/+12
2021-05-21t4013: test "git log -m --stat"Sergey Organov2-0/+67
2021-05-21t4013: test "git log -m --raw"Sergey Organov2-0/+62
2021-05-21t4013: test that "-m" alone has no effect in "git log"Sergey Organov1-0/+8
2021-05-21simple-ipc: correct ifdefs when NO_PTHREADS is definedJeff Hostetler6-14/+48
2021-05-21help: fix small typo in error messageJean-Noël Avila1-1/+1
2021-05-21trace2: refactor to avoid gcc warning under -O3Ævar Arnfjörð Bjarmason1-10/+8
2021-05-21Merge branch 'ds/sparse-index-protections'Junio C Hamano1-1/+1
2021-05-21Merge branch 'tz/c-locale-output-is-no-more'Junio C Hamano1-1/+1
2021-05-21Merge branch 'cs/http-use-basic-after-failed-negotiate'Junio C Hamano3-13/+48
2021-05-20l10n: sv.po: Update Swedish translation (5204t0f0u)Peter Krefting1-3192/+3684
2021-05-20merge-ort, diffcore-rename: employ cached renames when possibleElijah Newren4-30/+90
2021-05-20merge-ort: handle interactions of caching and rename/rename(1to1) casesElijah Newren1-1/+29
2021-05-20merge-ort: add helper functions for using cached renamesElijah Newren1-0/+47
2021-05-20merge-ort: preserve cached renames for the appropriate sideElijah Newren1-9/+11
2021-05-20merge-ort: avoid accidental API mis-useElijah Newren2-0/+9
2021-05-20merge-ort: add code to check for whether cached renames can be reusedElijah Newren1-2/+64
2021-05-20merge-ort: populate caches of rename detection resultsElijah Newren1-1/+72
2021-05-20merge-ort: add data structures for in-memory caching of rename detectionElijah Newren1-0/+53
2021-05-20t6429: testcases for remembering renamesElijah Newren2-6/+700
2021-05-20fast-rebase: write conflict state to working tree, index, and HEADElijah Newren1-19/+32
2021-05-20fast-rebase: change assert() to BUG()Elijah Newren1-1/+2