summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/common-main'Junio C Hamano2016-07-191-4/+13
|\
| * Merge branch 'jk/common-main-2.8' into jk/common-mainJunio C Hamano2016-07-061-4/+13
| |\
| | * add an extra level of indirection to main()Jeff King2016-07-011-4/+13
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-1/+4
|\ \ \ | |/ / |/| |
| * | i18n: rebase-interactive: mark strings for translationVasco Almeida2016-06-171-0/+1
| * | i18n: git-sh-setup.sh: mark strings for translationVasco Almeida2016-06-171-1/+3
* | | Merge branch 'mm/makefile-developer-can-be-in-config-mak'Junio C Hamano2016-06-031-8/+9
|\ \ \ | |/ / |/| |
| * | Makefile: add $(DEVELOPER_CFLAGS) variablemm/makefile-developer-can-be-in-config-makMatthieu Moy2016-06-011-9/+10
| * | Makefile: move 'ifdef DEVELOPER' after config.mak* inclusionMatthieu Moy2016-05-311-12/+12
| |/
| * Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-261-1/+1
| |\
| * \ Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-061-6/+0
| |\ \
| * \ \ Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano2016-04-291-2/+2
| |\ \ \
* | \ \ \ Merge branch 'jc/doc-lint'Junio C Hamano2016-05-231-0/+1
|\ \ \ \ \
| * | | | | ci: validate "linkgit:" in documentationjc/doc-lintJunio C Hamano2016-05-101-0/+1
| |/ / / /
* | | | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | i18n: git-parse-remote.sh: mark strings for translationVasco Almeida2016-04-191-1/+1
| |/ / /
* | | | Merge branch 'jc/drop-git-spec-in'Junio C Hamano2016-05-061-13/+6
|\ \ \ \
| * | | | Makefile: remove dependency on git.specjc/drop-git-spec-inDennis Kaarsemaker2016-04-271-1/+1
| * | | | Makefile: stop pretending to support rpmbuildJunio C Hamano2016-04-061-12/+5
| |/ / /
* | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-04-291-14/+14
|\ \ \ \
| * | | | test helpers: move test-* to t/helper/ subdirectoryNguyễn Thái Ngọc Duy2016-04-151-12/+12
| * | | | Makefile: clean *.o files we createJunio C Hamano2016-04-151-2/+2
* | | | | Merge branch 'ky/imap-send-openssl-1.1.0'Junio C Hamano2016-04-221-6/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | configure: remove checking for HMAC_CTX_cleanupky/imap-send-openssl-1.1.0Kazuki Yamaguchi2016-04-081-6/+0
* | | | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-131-2/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderrJunio C Hamano2016-04-051-2/+2
| * | Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano2015-06-251-24/+25
| |\ \
| * \ \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-051-0/+1
| |\ \ \
* | \ \ \ 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
| |\ \ \ \ \ \ \ \