summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/sane-grep'Junio C Hamano2016-03-161-1/+5
|\
| * sane_grep: pass "-a" if grep accepts itJunio C Hamano2016-03-101-1/+5
* | Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano2016-02-261-0/+12
|\ \
| * | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweakLars Schneider2016-02-251-0/+12
* | | Merge branch 'js/mingw-tests'Junio C Hamano2016-02-171-0/+1
|\ \ \ | |/ / |/| |
| * | mingw: fix t5601-clone.shJohannes Schindelin2016-01-271-0/+1
* | | Merge branch 'ep/make-phoney'Junio C Hamano2016-01-121-0/+9
|\ \ \ | |/ / |/| |
| * | Makefile: add missing phony targetep/make-phoneyElia Pinto2015-12-161-0/+9
| |/
| * Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano2015-12-081-0/+13
| |\
| * \ Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2015-11-051-6/+11
| |\ \
| * \ \ Merge branch 'jk/make-findstring-makeflags-fix' into maintJunio C Hamano2015-10-161-2/+2
| |\ \ \
| * \ \ \ Merge branch 'jw/make-arflags-customizable' into maintJunio C Hamano2015-10-161-3/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'dt/refs-backend-pre-vtable'Junio C Hamano2015-12-081-1/+2
|\ \ \ \ \ \
| * | | | | | refs: split filesystem-based refs code into a new fileMichael Haggerty2015-11-201-1/+2
* | | | | | | Merge branch 'ad/sha1-update-chunked'Junio C Hamano2015-12-041-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunkedAtousa Pahlevan Duprat2015-11-051-0/+13
* | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-10-291-0/+1
|\ \ \ \ \ \
| * | | | | | mailinfo: libifyJunio C Hamano2015-10-211-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rp/link-curl-before-ssl'Junio C Hamano2015-10-291-6/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Makefile: make curl-config path configurableRemi Pommarel2015-10-211-2/+6
| * | | | | Makefile: link libcurl before zlibRemi Pommarel2015-10-211-4/+5
| * | | | | Merge branch 'sg/help-group' into maintJunio C Hamano2015-09-031-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mr/worktree-list'Junio C Hamano2015-10-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | worktree: add top-level worktree.cMichael Rappazzo2015-10-021-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Makefile: drop D_INO_IN_DIRENT build knobJeff King2015-10-051-5/+0
| |/ / / / / /
* | | | | | | Merge branch 'jw/make-arflags-customizable'Junio C Hamano2015-10-051-3/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Makefile: allow $(ARFLAGS) specified from the command linejw/make-arflags-customizableJunio C Hamano2015-09-101-3/+6
* | | | | | | Merge branch 'jk/make-findstring-makeflags-fix'Junio C Hamano2015-10-051-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Makefile: fix MAKEFLAGS tests with multiple flagsjk/make-findstring-makeflags-fixJohn Keeping2015-09-101-2/+2
* | | | | | | Merge branch 'sb/submodule-helper'Junio C Hamano2015-10-051-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | submodule: rewrite `module_list` shell function in CStefan Beller2015-09-031-0/+1
| * | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-191-0/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'sg/help-group'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: use SHELL_PATH when running generate-cmdlist.shsg/help-groupAlejandro R. Sedeño2015-09-101-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-0/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-191-0/+2
* | | | | | | | Merge branch 'sg/help-group'Junio C Hamano2015-08-261-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | generate-cmdlist: re-implement as shell scriptEric Sunshine2015-08-251-2/+2
* | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | tempfile: a new module for handling temporary filesMichael Haggerty2015-08-101-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | builtin-am: remove redirection to git-am.shPaul Tan2015-08-041-1/+0
* | | | | | | | builtin-am: implement skeletal builtin amPaul Tan2015-08-041-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | pull: remove redirection to git-pull.shPaul Tan2015-06-181-1/+0
| * | | | | | | pull: implement skeletal builtin pullPaul Tan2015-06-151-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'kn/for-each-ref'Junio C Hamano2015-08-031-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | ref-filter: move code from 'for-each-ref'Karthik Nayak2015-08-031-0/+1
| |/ / / / /
* | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-131-0/+1
|\ \ \ \ \ \
| * | | | | | worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-291-0/+1