summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/compat-strdup' into maintJunio C Hamano2016-09-191-3/+14
|\
| * compat: move strdup(3) replacement to its own filers/compat-strdupRené Scharfe2016-09-071-3/+14
| * Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-10/+2
| |\
* | \ Merge branch 'ew/build-time-pager-tweaks'Junio C Hamano2016-08-081-1/+20
|\ \ \
| * | | pager: move pager-specific setup into the buildew/build-time-pager-tweaksEric Wong2016-08-041-1/+20
| |/ /
* | | Merge branch 'jk/pack-objects-optim'Junio C Hamano2016-08-081-0/+1
|\ \ \
| * | | add generic most-recently-used listJeff King2016-07-291-0/+1
* | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-07-251-10/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Makefile: use VCSSVN_LIB to refer to svn libraryJeff King2016-07-061-2/+2
| * | | Makefile: drop extra dependencies for test helpersJeff King2016-07-061-8/+0
* | | | Merge branch 'rw/make-needs-librt'Junio C Hamano2016-07-251-3/+9
|\ \ \ \
| * | | | Makefile: add NEEDS_LIBRT to optionally link with librtRonald Wampler2016-07-071-3/+9
* | | | | Merge branch 'mh/ref-iterators'Junio C Hamano2016-07-251-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | dir_iterator: new API for iterating over a directory treeMichael Haggerty2016-06-201-0/+1
| * | | | refs: introduce an iterator interfaceMichael Haggerty2016-06-201-0/+1
* | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |