summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/mingw-full-version-in-resources'Junio C Hamano2017-11-091-1/+2
|\
| * mingw: include the full version information in the resourcesjs/mingw-full-version-in-resourcesJohannes Schindelin2017-11-011-1/+2
| * Merge branch 'jn/vcs-svn-cleanup' into maintJunio C Hamano2017-09-101-1/+0
| |\
* | \ Merge branch 'jt/oidmap'Junio C Hamano2017-10-111-0/+1
|\ \ \
| * | | oidmap: map with OID as keyjt/oidmapJonathan Tan2017-10-011-0/+1
* | | | Merge branch 'mh/mmap-packed-refs'Junio C Hamano2017-10-031-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | packed_ref_cache: keep the `packed-refs` file mmapped if possibleMichael Haggerty2017-09-251-0/+6
* | | | Merge branch 'bw/git-clang-format'Junio C Hamano2017-09-251-0/+4
|\ \ \ \
| * | | | Makefile: add style build ruleBrandon Williams2017-08-141-0/+4
| | |/ / | |/| |
* | | | Merge branch 'jk/leak-checkers'Junio C Hamano2017-09-191-0/+3
|\ \ \ \
| * | | | add UNLEAK annotation for reducing leak false positivesJeff King2017-09-081-0/+3
| | |/ / | |/| |
* | | | Merge branch 'ti/external-sha1dc'Junio C Hamano2017-09-191-3/+15
|\ \ \ \ | |/ / / |/| | |
| * | | sha1dc: allow building with the external sha1dc libraryti/external-sha1dcTakashi Iwai2017-08-161-0/+13
| * | | sha1dc: build git plumbing code more explicitlyTakashi Iwai2017-08-161-3/+2
| |/ /
* | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-0/+1
|\ \ \
| * | | pack: move pack name-related functionsJonathan Tan2017-08-231-0/+1
* | | | Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2017-08-261-0/+1
|\ \ \ \
| * | | | perf: add test for writing the indexKevin Willford2017-08-211-0/+1
| | |/ / | |/| |
* | | | Merge branch 'jn/vcs-svn-cleanup'Junio C Hamano2017-08-261-1/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | vcs-svn: move remaining repo_tree functions to fast_export.hjn/vcs-svn-cleanupJonathan Nieder2017-08-231-1/+0
| * | Merge branch 'ls/macos-update' into maintJunio C Hamano2016-11-291-0/+1
| |\ \
| * \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-281-0/+14
| |\ \ \
| * \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-291-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/compat-strdup' into maintJunio C Hamano2016-09-191-3/+14
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mh/packed-ref-store'Junio C Hamano2017-08-221-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | packed-backend: new module for handling packed referencesMichael Haggerty2017-06-231-0/+1
* | | | | | | Merge branch 'jc/po-pritime-fix'Junio C Hamano2017-07-211-0/+21
|\ \ \ \ \ \ \
| * | | | | | | Makefile: help gettext tools to cope with our custom PRItime formatjc/po-pritime-fixJunio C Hamano2017-07-201-0/+21
* | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-201-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Makefile: allow combining UBSan with other sanitizersjk/build-with-asanRené Scharfe2017-07-171-1/+6
* | | | | | | | Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-131-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Makefile: disable unaligned loads with UBSanJeff King2017-07-101-0/+3
| * | | | | | | Makefile: turn off -fomit-frame-pointer with sanitizersJeff King2017-07-101-0/+1
| * | | | | | | Makefile: add helper for compiling with -fsanitizeJeff King2017-07-101-0/+4
* | | | | | | | Merge branch 'ab/sha1dc'Junio C Hamano2017-07-101-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1collisiondetection: automatically enable when submodule is populatedab/sha1dcJunio C Hamano2017-07-031-0/+4
| * | | | | | | | sha1dc: optionally use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason2017-07-031-0/+12
| |/ / / / / / /
* | | | | | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-051-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | repository: introduce the repository objectBrandon Williams2017-06-231-0/+1
* | | | | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-221-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | configure.ac: loosen FREAD_READS_DIRECTORIES test programnd/fopen-errorsJeff King2017-06-151-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-191-8/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: add support for PCRE v2Ævar Arnfjörð Bjarmason2017-06-021-8/+28
| * | | | | | | | grep: un-break building with PCRE >= 8.32 without --enable-jitÆvar Arnfjörð Bjarmason2017-06-021-0/+13
* | | | | | | | | Merge branch 'js/blame-lib'Junio C Hamano2017-06-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: move origin-related methods to libgitJeff Smith2017-05-251-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/sha1dc-maint'Junio C Hamano2017-06-041-1/+8
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-05-221-1/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/grep-preparatory-cleanup'Junio C Hamano2017-06-021-4/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | test-lib: add a PTHREADS prerequisiteÆvar Arnfjörð Bjarmason2017-05-261-0/+1