summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/sha1-header-selection-with-cpp-macros'Junio C Hamano2017-03-171-7/+5
|\
| * hash.h: move SHA-1 implementation selection into a header filebc/sha1-header-selection-with-cpp-macrosbrian m. carlson2017-03-151-7/+5
* | Merge branch 'jk/interop-test'Junio C Hamano2017-03-171-0/+3
|\ \
| * | t: add an interoperability test harnessJeff King2017-03-101-0/+3
| |/
* | Merge branch 'rj/remove-unused-mktemp'Junio C Hamano2017-03-101-5/+0
|\ \
| * | wrapper.c: remove unused gitmkstemps() functionrj/remove-unused-mktempRamsay Jones2017-02-281-5/+0
| |/
* | Merge branch 'js/rebase-helper'Junio C Hamano2017-02-271-0/+1
|\ \
| * | rebase--helper: add a builtin helper for interactive rebasesJohannes Schindelin2017-02-091-0/+1
| |/
* | add oidset APIJeff King2017-02-081-0/+1
|/
* Merge branch 'bc/use-asciidoctor-opt'Junio C Hamano2017-02-021-0/+6
|\
| * Makefile: add a knob to enable the use of Asciidoctorbrian m. carlson2017-01-231-0/+6
* | Merge branch 'js/retire-relink'Junio C Hamano2017-02-021-1/+0
|\ \
| * | relink: retire the commandJohannes Schindelin2017-01-251-1/+0
| |/
* | Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-311-1/+1
|\ \
| * | difftool: retire the scripted versionJohannes Schindelin2017-01-191-1/+0
| * | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-1/+2
| |/
* | Merge branch 'rs/qsort-s'Junio C Hamano2017-01-311-0/+8
|\ \
| * | compat: add qsort_s()René Scharfe2017-01-231-0/+8
| |/
* | Makefile: put LIBS after LDFLAGS for imap-sendsp/cygwin-build-fixesSteven Penny2017-01-091-1/+1
* | Makefile: POSIX windresSteven Penny2017-01-091-1/+1
* | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-271-1/+2
|\ \
| * | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-141-1/+1
| * | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-141-1/+2
* | | Merge branch 'jk/make-tags-find-sources-tweak'Junio C Hamano2016-12-191-3/+16
|\ \ \
| * | | Makefile: exclude contrib from FIND_SOURCE_FILESjk/make-tags-find-sources-tweakJeff King2016-12-141-0/+2
| * | | Makefile: match shell scripts in FIND_SOURCE_FILESJeff King2016-12-141-1/+3
| * | | Makefile: exclude test cruft from FIND_SOURCE_FILESJeff King2016-12-141-1/+7
| * | | Makefile: reformat FIND_SOURCE_FILESJeff King2016-12-141-3/+6
| | |/ | |/|
* | | xdiff: drop XDL_FAST_HASHjk/xdiff-drop-xdl-fast-hashJeff King2016-12-061-9/+0
|/ /
* | Merge branch 'ls/macos-update'Junio C Hamano2016-11-111-0/+1
|\ \
| * | Makefile: set NO_OPENSSL on macOS by defaultLars Schneider2016-11-101-0/+1
| * | Merge branch 'jk/common-main' into maintJunio C Hamano2016-09-081-4/+13
| |\ \
* | \ \ Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-171-0/+1
|\ \ \ \
| * | | | tmp-objdir: introduce API for temporary object directoriesJeff King2016-10-101-0/+1
* | | | | coccicheck: use --all-includes by defaultRené Scharfe2016-09-291-1/+2
|/ / / /
* | | | Merge branch 'js/regexec-buf'Junio C Hamano2016-09-261-1/+2
|\ \ \ \
| * | | | regex: add regexec_buf() that can work on a non NUL-terminated stringJohannes Schindelin2016-09-211-1/+2
* | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-261-0/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add coccicheck make targetRené Scharfe2016-09-151-0/+14
* | | | | Merge branch 'cc/apply-am'Junio C Hamano2016-09-191-0/+1
|\ \ \ \ \
| * | | | | builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-111-0/+1
* | | | | | Merge branch 'rs/compat-strdup'Junio C Hamano2016-09-121-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