summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-071-2/+3
|\
| * Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder2013-02-011-2/+3
* | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-041-2/+2
|\ \
| * | Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones2013-01-221-1/+1
| * | Which merge_file() function do you mean?Junio C Hamano2012-12-091-1/+1
* | | Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maintJunio C Hamano2013-01-141-0/+4
|\ \ \
| * | | Makefile: add comment on CYGWIN_V15_WIN32APIMark Levedahl2013-01-061-0/+4
* | | | Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-01-111-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
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Makefile: detect when PYTHON_PATH changesChristian Couder2013-01-101-2/+14
* | | | | | | | | | Makefile: whitespace style fixes in macro definitionsStefano Lattarini2012-12-101-28/+28
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: hide stderr of curl-config testPaul Gortmaker2012-11-261-1/+1
* | | | | | | | | | Merge branch 'ml/cygwin-mingw-headers'Junio C Hamano2012-11-201-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | USE CGYWIN_V15_WIN32API as macro to select api for cygwinMark Levedahl2012-11-181-3/+3
| * | | | | | | | | Update cygwin.c for new mingw-64 win32 api headersMark Levedahl2012-11-121-0/+4
* | | | | | | | | | Merge branch 'js/hp-nonstop'Junio C Hamano2012-11-151-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix 'make test' for HP NonStopJoachim Schmitz2012-10-301-0/+4
* | | | | | | | | | fetch-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+1
* | | | | | | | | | send-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+1
* | | | | | | | | | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+1
* | | | | | | | | | Merge branch 'fa/remote-svn'Jeff King2012-10-251-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add git-remote-testsvn to MakefileFlorian Achleitner2012-10-071-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | MALLOC_CHECK: Allow checking to be disabled from config.makRamsay Jones2012-10-101-0/+1
* | | | | | | | | Merge branch 'js/hp-nonstop'Junio C Hamano2012-09-251-0/+67
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Port to HP NonStopJoachim Schmitz2012-09-191-0/+67
* | | | | | | | | Merge branch 'js/poll-emu'Junio C Hamano2012-09-251-5/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | make poll available for other platforms lacking itJoachim Schmitz2012-09-171-5/+15
* | | | | | | | | Merge branch 'mh/string-list'Junio C Hamano2012-09-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | string_list: add two new functions for splitting stringsMichael Haggerty2012-09-121-0/+1
* | | | | | | | | Merge branch 'js/compat-itimer'Junio C Hamano2012-09-121-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a no-op setitimer() wrapperJoachim Schmitz2012-09-081-0/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/compat-mkdir'Junio C Hamano2012-09-121-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document MKDIR_WO_TRAILING_SLASH in MakefileJoachim Schmitz2012-09-081-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rj/test-regex'Junio C Hamano2012-09-111-0/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-021-0/+1
* | | | | | | | Merge branch 'jk/check-docs-update'Junio C Hamano2012-08-221-26/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | check-docs: get documented command list from MakefileJeff King2012-08-081-24/+2
| * | | | | | check-docs: drop git-help special-caseJeff King2012-08-081-1/+0
| * | | | | | check-docs: list git-gui as a commandJeff King2012-08-081-2/+1
| * | | | | | check-docs: factor out command-listJeff King2012-08-081-2/+6
| * | | | | | check-docs: update non-command documentation listJeff King2012-08-081-0/+3
| * | | | | | check-docs: mention gitweb speciallyJeff King2012-08-081-2/+2
* | | | | | | Merge branch 'bw/maint-1.7.9-solaris-getpass'Junio C Hamano2012-08-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |