summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Libravatar Junio C Hamano2-1/+113
2019-08-08Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-1/+1
2019-08-08Merge branch 'mr/doc-can-not-to-cannot'Libravatar Junio C Hamano6-7/+7
2019-08-08Merge branch 'ds/commit-graph-octopus-fix'Libravatar Junio C Hamano2-2/+4
2019-08-06merge-recursive: avoid directory rename detection in recursive caseLibravatar Elijah Newren2-1/+113
2019-08-05commit-graph: fix bug around octopus mergesLibravatar Derrick Stolee2-2/+4
2019-08-05restore: fix typo in docsLibravatar William Chargin1-1/+1
2019-08-05doc: typo: s/can not/cannot/ and s/is does/does/Libravatar Mark Rushakoff6-7/+7
2019-08-02Git 2.23-rc1Libravatar Junio C Hamano2-1/+2
2019-08-02Merge branch 'sg/fsck-config-in-doc'Libravatar Junio C Hamano1-0/+5
2019-08-02Merge branch 'js/visual-studio'Libravatar Junio C Hamano9-100/+576
2019-08-02Merge branch 'jc/log-mailmap-flip-defaults'Libravatar Junio C Hamano5-27/+39
2019-08-02Merge branch 'js/early-config-with-onbranch'Libravatar Junio C Hamano2-1/+7
2019-08-02log: really flip the --mailmap defaultLibravatar Junio C Hamano3-6/+36
2019-08-01Merge branch 'jk/repack-silence-auto-bitmap-warning'Libravatar Junio C Hamano3-23/+37
2019-08-01Merge branch 'jk/sort-iter-test-output'Libravatar Junio C Hamano2-33/+55
2019-08-01Merge branch 'jc/dir-iterator-test-fix'Libravatar Junio C Hamano2-3/+12
2019-08-01Merge branch 'bc/hash-independent-tests-part-4'Libravatar Junio C Hamano11-93/+142
2019-08-01RelNotes/2.23.0: fix a few typos and other minor issuesLibravatar Martin Ågren1-7/+7
2019-08-01Sync with maintLibravatar Junio C Hamano1-1/+1
2019-08-01RelNotes/2.21.1: typofixLibravatar Martin Ågren1-1/+1
2019-08-01log: flip the --mailmap default unconditionallyLibravatar Junio C Hamano3-22/+4
2019-07-31config: work around bug with includeif:onbranch and early configLibravatar Johannes Schindelin2-1/+7
2019-07-31A few more last-minute fixesLibravatar Junio C Hamano1-63/+2
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Libravatar Junio C Hamano3-8/+0
2019-07-31Merge branch 'jk/no-system-includes-in-dot-c'Libravatar Junio C Hamano3-3/+0
2019-07-31repack: simplify handling of auto-bitmaps and .keep filesLibravatar Jeff King2-16/+4
2019-07-31repack: silence warnings when auto-enabled bitmaps cannot be builtLibravatar Jeff King3-11/+36
2019-07-31t7700: clean up .keep file in bitmap-writing testLibravatar Jeff King1-0/+1
2019-07-31t: sort output of hashmap iterationLibravatar Jeff King2-33/+55
2019-07-30test-dir-iterator: do not assume errno valuesLibravatar Junio C Hamano2-3/+12
2019-07-29git: avoid calling aliased builtins via their dashed formLibravatar Johannes Schindelin1-3/+0
2019-07-29bin-wrappers: append `.exe` to target paths if necessaryLibravatar Johannes Schindelin1-1/+1
2019-07-29.gitignore: ignore Visual Studio's temporary/generated filesLibravatar Johannes Schindelin1-0/+3
2019-07-29.gitignore: touch up the entries regarding Visual StudioLibravatar Philip Oakley1-2/+3
2019-07-29vcxproj: also link-or-copy builtinsLibravatar Johannes Schindelin2-0/+18
2019-07-29msvc: add a Makefile target to pre-generate the Visual Studio solutionLibravatar Johannes Schindelin3-1/+86
2019-07-29contrib/buildsystems: add a backend for modern Visual Studio versionsLibravatar Johannes Schindelin1-0/+385
2019-07-29contrib/buildsystems: handle options starting with a slashLibravatar Johannes Schindelin1-1/+1
2019-07-29contrib/buildsystems: also handle -lexpatLibravatar Johannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: handle libiconv, tooLibravatar Johannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: handle the curl library optionLibravatar Philip Oakley1-1/+3
2019-07-29contrib/buildsystems: error out on unknown optionLibravatar Johannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: optionally capture the dry-run in a fileLibravatar Philip Oakley1-0/+10
2019-07-29contrib/buildsystems: redirect errors of the dry run into a log fileLibravatar Philip Oakley1-1/+6
2019-07-29contrib/buildsystems: ignore gettext stuffLibravatar Philip Oakley1-0/+6
2019-07-29contrib/buildsystems: handle quoted spaces in filenamesLibravatar Philip Oakley1-3/+4
2019-07-29contrib/buildsystems: fix misleading error messageLibravatar Philip Oakley1-1/+1
2019-07-29contrib/buildsystems: ignore irrelevant files in Generators/Libravatar Johannes Schindelin1-1/+1
2019-07-29contrib/buildsystems: ignore invalidcontinue.objLibravatar Philip Oakley1-3/+7