summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/line-log'Junio C Hamano2013-06-021-0/+4
|\
| * Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+2
| * Refactor parse_locBo Yang2013-03-281-0/+2
* | Merge branch 'tr/coverage'Junio C Hamano2013-06-021-8/+13
|\ \
| * | coverage: build coverage-untested-functions by defaultThomas Rast2013-05-131-1/+1
| * | coverage: set DEFAULT_TEST_TARGET to avoid using proveThomas Rast2013-05-131-1/+1
| * | coverage: do not delete .gcno files before buildingThomas Rast2013-05-131-3/+6
| * | coverage: split build target into compile and testThomas Rast2013-05-131-3/+5
* | | Merge branch 'da/darwin'Junio C Hamano2013-06-021-0/+15
|\ \ \
| * | | cache.h: eliminate SHA-1 deprecation warnings on Mac OS XDavid Aguilar2013-05-201-0/+6
| * | | Makefile: add support for Apple CommonCrypto facilityDavid Aguilar2013-05-201-0/+8
| * | | Makefile: fix default regex settings on DarwinDavid Aguilar2013-05-111-0/+1
| |/ /
* | | Merge branch 'fc/macos-x-clipped-write'Junio C Hamano2013-06-021-0/+8
|\ \ \
| * | | compate/clipped-write.c: large write(2) fails on Mac OS X/XNUFilipe Cabecinhas2013-05-171-0/+8
| | |/ | |/|
* | | Merge branch 'jk/test-output'Junio C Hamano2013-05-291-0/+3
|\ \ \
| * | | test output: respect $TEST_OUTPUT_DIRECTORYJohn Keeping2013-04-291-0/+3
* | | | Merge branch 'rj/sparse'Junio C Hamano2013-05-291-0/+1
|\ \ \ \
| * | | | compat/nedmalloc: Fix some sparse warningsRamsay Jones2013-04-281-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'mh/packed-refs-various'Junio C Hamano2013-05-291-2/+0
|\ \ \ \
| * | | | pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}Michael Haggerty2013-05-011-2/+0
* | | | | git-remote-testgit: build it to run under $SHELL_PATHJunio C Hamano2013-04-281-0/+1
| |/ / / |/| | |
* | | | Merge branch 'jk/common-make-variables-export-safety'Junio C Hamano2013-04-011-15/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Makefile: make mandir, htmldir and infodir absoluteJohn Keeping2013-02-251-15/+21
* | | | Merge branch 'maint'Junio C Hamano2013-03-171-16/+13
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Makefile: keep LIB_H entries together and sortedRené Scharfe2013-03-161-16/+13
| * | Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-02-271-6/+8
| |\ \ | | |/ | |/|
| * | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-071-2/+3
| |\ \
| * \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-041-2/+2
| |\ \ \
| * \ \ \ Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maintJunio C Hamano2013-01-141-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-01-111-2/+8
| |\ \ \ \ \
| * | | | | | Makefile: detect when PYTHON_PATH changesChristian Couder2013-01-101-2/+14
* | | | | | | Revert "compat: add strtok_r()"Erik Faye-Lund2013-02-261-6/+0
* | | | | | | Merge branch 'jn/less-reconfigure'Junio C Hamano2013-02-251-6/+8
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Makefile: avoid infinite loop on configure.ac changeJeff King2013-02-201-6/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mk/make-rm-depdirs-could-be-empty'Junio C Hamano2013-02-141-2/+1
|\ \ \ \ \ \
| * | | | | | Makefile: don't run "rm" without any filesMatt Kraai2013-02-131-2/+1
* | | | | | | Merge branch 'mk/old-expat'Junio C Hamano2013-02-141-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Allow building with xmlparse.hMatt Kraai2013-02-111-0/+6
| |/ / / / / /
* | | | | | | Makefile: make script-related rules usable from subdirectoriesMatthieu Moy2013-02-081-3/+32
|/ / / / / /
* | | | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache'Junio C Hamano2013-02-051-2/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder2013-02-011-2/+3
* | | | | | Merge branch 'nd/retire-fnmatch'Junio C Hamano2013-01-251-0/+6
|\ \ \ \ \ \
| * | | | | | Makefile: add USE_WILDMATCH to use wildmatch as fnmatchNguyễn Thái Ngọc Duy2013-01-011-0/+6
* | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-01-231-0/+3
|\ \ \ \ \ \ \
| * | | | | | | add git-check-ignore sub-commandAdam Spiers2013-01-061-0/+1
| * | | | | | | add.c: move pathspec matchers into new pathspec.c for reuseAdam Spiers2013-01-061-0/+2
* | | | | | | | Merge branch 'jc/makefile-perl-python-path-doc'Junio C Hamano2013-01-231-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: add description on PERL/PYTHON_PATHJunio C Hamano2013-01-131-0/+5
* | | | | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones2013-01-221-1/+1