summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano2011-09-021-0/+4
|\
| * Use kwset in pickaxeFredrik Kuivinen2011-08-201-0/+2
| * Add obstack.[ch] from EGLIBC 2.10Fredrik Kuivinen2011-08-201-0/+2
* | Merge branch 'da/difftool-mergtool-refactor'Junio C Hamano2011-08-251-0/+11
|\ \
| * | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+11
| |/
* | Merge branch 'di/parse-options-split'Junio C Hamano2011-08-251-1/+2
|\ \ | |/ |/|
| * Reduce parse-options.o dependenciesDmitry Ivankov2011-08-111-1/+2
* | Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-171-1/+1
|\ \
| * | teach --histogram to diffTay Ray Chuan2011-07-121-1/+1
* | | Merge branch 'rc/maint-http-wrong-free'Junio C Hamano2011-08-111-3/+3
|\ \ \ | |_|/ |/| |
| * | Makefile: some changes for http-related flag documentationTay Ray Chuan2011-08-031-3/+3
| * | Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-05-261-9/+9
| |\ \
* | | | Makefile: add Minix configuration options.Thomas Cort2011-07-201-1/+29
* | | | Merge branch 'ak/gcc46-profile-feedback'Junio C Hamano2011-07-191-0/+22
|\ \ \ \
| * | | | Add profile feedback build to gitAndi Kleen2011-06-201-0/+16
| * | | | Add option to disable NORETURNJunio C Hamano2011-06-201-0/+6
| | |_|/ | |/| |
* | | | Merge branch 'fk/relink-upon-ldflags-update'Junio C Hamano2011-07-131-8/+17
|\ \ \ \
| * | | | Makefile: Track changes to LDFLAGS and relink when necessaryFredrik Kuivinen2011-06-221-8/+17
| |/ / /
* | | | Merge branch 'md/interix-update'Junio C Hamano2011-07-131-2/+4
|\ \ \ \
| * | | | Update the Interix default build configuration.Markus Duft2011-06-151-2/+4
* | | | | Merge branch 'jc/streaming' into nextJunio C Hamano2011-06-291-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | streaming: a new API to read from the object storeJunio C Hamano2011-05-201-0/+2
* | | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-301-0/+16
|\ \ \ \ \
| * | | | | Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONSJunio C Hamano2011-05-161-0/+1
| * | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-091-0/+15
* | | | | | Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano2011-05-291-0/+2
|\ \ \ \ \ \
| * | | | | | bisect: refactor sha1_array into a generic sha1 listJeff King2011-05-191-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rg/no-gecos-in-pwent'Junio C Hamano2011-05-261-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwdRafael Gieschke2011-05-191-0/+3
* | | | | | Merge branch 'ab/i18n-scripts-basic'Junio C Hamano2011-05-231-1/+7
|\ \ \ \ \ \
| * | | | | | Makefile: add xgettext target for *.sh filesÆvar Arnfjörð Bjarmason2011-05-141-1/+5
| * | | | | | git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappersÆvar Arnfjörð Bjarmason2011-05-141-0/+1
| * | | | | | git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()Ævar Arnfjörð Bjarmason2011-05-141-0/+1
* | | | | | | Makefile: sort TEST_PROGRAMS listJeff King2011-05-191-2/+2
* | | | | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-161-9/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-091-9/+9
| * | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-091-10/+9
| * | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-281-9/+10
| * | | | | Merge branch 'mr/hpux' into maintJunio C Hamano2011-03-201-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ae/better-template-failure-report' into maintJunio C Hamano2011-03-201-0/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jn/gitweb-dependency'Junio C Hamano2011-05-111-27/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski2011-05-081-26/+0
| * | | | | | git-instaweb: Simplify build dependency on gitwebJakub Narebski2011-05-081-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'js/info-man-path'Junio C Hamano2011-05-061-1/+3
|\ \ \ \ \ \
| * | | | | | git: add --info-path and --man-path optionsJon Seymour2011-05-011-1/+3
| |/ / / / /
* | | | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-281-1/+3
|\ \ \ \ \ \
| * | | | | | Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-251-3/+3
| * | | | | | rebase: extract am code to new source fileMartin von Zweigbergk2011-02-101-0/+1
| * | | | | | rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-101-0/+1
* | | | | | | sparse: Fix errors due to missing target-specific variablesRamsay Jones2011-04-221-17/+28