summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/check-mailmap'Junio C Hamano2013-07-221-0/+1
|\
| * builtin: add git-check-mailmap commandEric Sunshine2013-07-131-0/+1
* | Merge branch 'maint'Junio C Hamano2013-07-051-3/+0
|\ \
| * | fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2013-07-031-3/+0
| * | Merge branch 'fc/macos-x-clipped-write' into maintJunio C Hamano2013-06-301-0/+8
| |\ \
* | \ \ Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-011-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | prio-queue: priority queue of pointers to structsJunio C Hamano2013-06-111-0/+3
* | | | Merge branch 'jh/libify-note-handling'Junio C Hamano2013-06-241-0/+2
|\ \ \ \
| * | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-121-0/+2
* | | | | Merge branch 'rs/discard-index-discard-array'Junio C Hamano2013-06-201-0/+1
|\ \ \ \ \
| * | | | | read-cache: add simple performance testRené Scharfe2013-06-091-0/+1
| |/ / / /
* | | | | Merge branch 'fc/makefile'Junio C Hamano2013-06-201-4/+6
|\ \ \ \ \
| * | | | | Makefile: use $^ to avoid listing prerequisites on the command lineFelipe Contreras2013-06-091-3/+3
| * | | | | build: do not install git-remote-testgitFelipe Contreras2013-06-071-0/+1
| * | | | | build: generate and clean test scriptsFelipe Contreras2013-06-071-1/+2
| * | | | | Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefileJunio C Hamano2013-06-071-0/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/make-wildmatch-default'Junio C Hamano2013-06-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Makefile: promote wildmatch to be the default fnmatch implementationNguyễn Thái Ngọc Duy2013-06-021-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rj/mingw-cygwin'Junio C Hamano2013-06-111-7/+0
|\ \ \ \ \ \ \
| * | | | | | | cygwin: Remove the CYGWIN_V15_WIN32API build variableRamsay Jones2013-05-081-7/+0
| |/ / / / / /
* | | | | | | Merge tag 'post183-for-junio' of http://github.com/msysgit/gitJunio C Hamano2013-06-071-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Ensure the resource file is rebuilt when the version changes.Pat Thoyts2013-06-041-1/+1
| * | | | | | | Windows resource: handle dashes in the Git version gracefullyJohannes Schindelin2013-06-041-1/+1
| * | | | | | | Provide a Windows version resource for the git executables.Pat Thoyts2013-06-041-1/+7
* | | | | | | | Merge branch 'fc/makefile'Junio C Hamano2013-06-051-18/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | build: do not install git-remote-testpyFelipe Contreras2013-05-261-0/+2
| * | | | | | build: add NO_INSTALL variableFelipe Contreras2013-05-261-6/+10
| * | | | | | build: cleanup using $<Felipe Contreras2013-05-261-5/+5
| * | | | | | build: cleanup using $^Felipe Contreras2013-05-261-4/+4
| * | | | | | build: trivial simplificationFelipe Contreras2013-05-261-3/+3
| |/ / / / /
* | | | | | 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