summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* git-merge: honor pre-merge-commit hookMichael J Gruber2019-08-074-1/+129
* merge: do no-verify like commitMichael J Gruber2019-08-073-4/+8
* t7503: verify proper hook executionJosh Steadmon2019-08-071-68/+89
* Git 2.23-rc1v2.23.0-rc1Junio C Hamano2019-08-022-1/+2
* Merge branch 'sg/fsck-config-in-doc'Junio C Hamano2019-08-021-0/+5
|\
| * Documentation/git-fsck.txt: include fsck.* config variablesSZEDER Gábor2019-07-291-0/+5
* | Merge branch 'js/visual-studio'Junio C Hamano2019-08-029-100/+576
|\ \
| * | git: avoid calling aliased builtins via their dashed formJohannes Schindelin2019-07-291-3/+0
| * | bin-wrappers: append `.exe` to target paths if necessaryJohannes Schindelin2019-07-291-1/+1
| * | .gitignore: ignore Visual Studio's temporary/generated filesJohannes Schindelin2019-07-291-0/+3
| * | .gitignore: touch up the entries regarding Visual StudioPhilip Oakley2019-07-291-2/+3
| * | vcxproj: also link-or-copy builtinsJohannes Schindelin2019-07-292-0/+18
| * | msvc: add a Makefile target to pre-generate the Visual Studio solutionJohannes Schindelin2019-07-293-1/+86
| * | contrib/buildsystems: add a backend for modern Visual Studio versionsJohannes Schindelin2019-07-291-0/+385
| * | contrib/buildsystems: handle options starting with a slashJohannes Schindelin2019-07-291-1/+1
| * | contrib/buildsystems: also handle -lexpatJohannes Schindelin2019-07-291-0/+2
| * | contrib/buildsystems: handle libiconv, tooJohannes Schindelin2019-07-291-0/+2
| * | contrib/buildsystems: handle the curl library optionPhilip Oakley2019-07-291-1/+3
| * | contrib/buildsystems: error out on unknown optionJohannes Schindelin2019-07-291-0/+2
| * | contrib/buildsystems: optionally capture the dry-run in a filePhilip Oakley2019-07-291-0/+10
| * | contrib/buildsystems: redirect errors of the dry run into a log filePhilip Oakley2019-07-291-1/+6
| * | contrib/buildsystems: ignore gettext stuffPhilip Oakley2019-07-291-0/+6
| * | contrib/buildsystems: handle quoted spaces in filenamesPhilip Oakley2019-07-291-3/+4
| * | contrib/buildsystems: fix misleading error messagePhilip Oakley2019-07-291-1/+1
| * | contrib/buildsystems: ignore irrelevant files in Generators/Johannes Schindelin2019-07-291-1/+1
| * | contrib/buildsystems: ignore invalidcontinue.objPhilip Oakley2019-07-291-3/+7
| * | Vcproj.pm: urlencode '<' and '>' when generating VC projectsJohannes Schindelin2019-07-291-0/+8
| * | Vcproj.pm: do not configure VCWebServiceProxyGeneratorToolJohannes Schindelin2019-07-291-12/+0
| * | Vcproj.pm: list git.exe first to be startup projectPhilip Oakley2019-07-291-14/+19
| * | Vcproj.pm: auto-generate GUIDsJohannes Schindelin2019-07-291-57/+9
* | | Merge branch 'jc/log-mailmap-flip-defaults'Junio C Hamano2019-08-025-27/+39
|\ \ \
| * | | log: really flip the --mailmap defaultJunio C Hamano2019-08-023-6/+36
| * | | log: flip the --mailmap default unconditionallyJunio C Hamano2019-08-013-22/+4
* | | | Merge branch 'js/early-config-with-onbranch'Junio C Hamano2019-08-022-1/+7
|\ \ \ \
| * | | | config: work around bug with includeif:onbranch and early configJohannes Schindelin2019-08-012-1/+7
| |/ / /
* | | | Merge branch 'jk/repack-silence-auto-bitmap-warning'Junio C Hamano2019-08-013-23/+37
|\ \ \ \
| * | | | repack: simplify handling of auto-bitmaps and .keep filesJeff King2019-07-312-16/+4
| * | | | repack: silence warnings when auto-enabled bitmaps cannot be builtJeff King2019-07-313-11/+36
| * | | | t7700: clean up .keep file in bitmap-writing testJeff King2019-07-311-0/+1
* | | | | Merge branch 'jk/sort-iter-test-output'Junio C Hamano2019-08-012-33/+55
|\ \ \ \ \
| * | | | | t: sort output of hashmap iterationJeff King2019-07-312-33/+55
| |/ / / /
* | | | | Merge branch 'jc/dir-iterator-test-fix'Junio C Hamano2019-08-012-3/+12
|\ \ \ \ \
| * | | | | test-dir-iterator: do not assume errno valuesJunio C Hamano2019-07-302-3/+12
* | | | | | Merge branch 'bc/hash-independent-tests-part-4'Junio C Hamano2019-08-0111-93/+142
|\ \ \ \ \ \
| * | | | | | t2203: avoid hard-coded object ID valuesbrian m. carlson2019-07-011-2/+4
| * | | | | | t1710: make hash independentbrian m. carlson2019-07-011-17/+34
| * | | | | | t1007: remove SHA1 prerequisitesbrian m. carlson2019-07-011-26/+32
| * | | | | | t0090: make test pass with SHA-256brian m. carlson2019-07-011-2/+2
| * | | | | | t0027: make hash size independentbrian m. carlson2019-07-011-2/+4
| * | | | | | t6030: make test work with SHA-256brian m. carlson2019-07-011-15/+16