summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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 '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
| * | | | | | | grep: change the internal PCRE macro names to be PCRE1Ævar Arnfjörð Bjarmason2017-05-261-2/+2
| * | | | | | | perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't doÆvar Arnfjörð Bjarmason2017-05-211-0/+3
| * | | | | | | Makefile & configure: reword inaccurate comment about PCREÆvar Arnfjörð Bjarmason2017-05-211-2/+4
| |/ / / / / /
* | | | | | | Merge branch 'bp/sub-process-convert-filter'Junio C Hamano2017-05-301-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | sub-process: move sub-process functions into separate filesBen Peart2017-05-151-0/+1
* | | | | | | Merge branch 'mh/separate-ref-cache'Junio C Hamano2017-04-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | refs: split `ref_cache` code into separate filesMichael Haggerty2017-04-161-0/+1
* | | | | | | | Merge branch 'jh/add-index-entry-optim'Junio C Hamano2017-04-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: add strcmp_offset functionJeff Hostetler2017-04-151-0/+1
* | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2017-04-191-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-online-cpus: helper to return cpu countJeff Hostetler2017-04-121-0/+1
* | | | | | | | | | Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-191-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | t/helper: add test-ref-store to test ref-store functionsNguyễn Thái Ngọc Duy2017-04-141-0/+1
* | | | | | | | | | Merge branch 'ab/regen-perl-mak-with-different-perl'Junio C Hamano2017-04-161-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | perl: regenerate perl.mak if perl -V changesab/regen-perl-mak-with-different-perlÆvar Arnfjörð Bjarmason2017-03-291-0/+1
* | | | | | | | | | Merge branch 'jk/make-coccicheck-detect-errors'Junio C Hamano2017-03-301-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Makefile: detect errors in running spatchjk/make-coccicheck-detect-errorsJeff King2017-03-291-2/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2017-03-281-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | name-hash: add test-lazy-init-name-hashJeff Hostetler2017-03-241-0/+1
| |/ / / / / / /