summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Which merge_file() function do you mean?Junio C Hamano2012-12-091-1/+1
* | | | | | | | Merge branch 'jc/comment-cygwin-win32api-in-makefile'Junio C Hamano2013-01-101-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Makefile: add comment on CYGWIN_V15_WIN32APIMark Levedahl2013-01-061-0/+4
* | | | | | | | Merge branch 'jk/config-uname'Junio C Hamano2013-01-101-542/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: hoist uname autodetection to config.mak.unameJeff King2013-01-031-542/+1
* | | | | | | | | Merge branch 'nd/wildmatch'Junio C Hamano2013-01-101-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Integrate wildmatch to gitNguyễn Thái Ngọc Duy2012-10-151-0/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/less-reconfigure'Junio C Hamano2013-01-091-2/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | build: do not automatically reconfigure unless configure.ac changedJonathan Nieder2013-01-021-2/+8
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Sync with 1.7.11.7Junio C Hamano2012-09-141-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-141-0/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Junio C Hamano2012-08-241-0/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jn/block-sha1' into maintJunio C Hamano2012-08-061-3/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jn/make-assembly-in-right-directory' into maintJunio C Hamano2012-08-061-1/+1
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'jk/check-docs-update' into maintJunio C Hamano2012-09-111-26/+9
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/no-gitk-build-dependency'Junio C Hamano2013-01-061-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makefile: replace "echo 1>..." with "echo >..."Christian Couder2012-12-181-5/+5
| * | | | | | | | | | | | Makefile: detect when PYTHON_PATH changesChristian Couder2012-12-181-2/+14
| * | | | | | | | | | | | Makefile: remove tracking of TCLTK_PATHChristian Couder2012-12-181-13/+1
* | | | | | | | | | | | | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Rename git-remote-testgit to git-remote-testpyFelipe Contreras2012-11-291-1/+1
* | | | | | | | | | | | | Merge branch 'mk/qnx'Junio C Hamano2013-01-031-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \