summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-1916-126/+323
|\
| * zlib: allow feeding more than 4GB in one goJunio C Hamano2011-06-101-20/+58
| * zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-1015-70/+142
| * zlib: wrap deflateBound() tooJunio C Hamano2011-06-108-10/+17
| * zlib: wrap deflate side of the APIJunio C Hamano2011-06-1010-41/+105
| * zlib: wrap inflateInit2 used to accept only for gzip formatJunio C Hamano2011-06-103-4/+17
| * zlib: wrap remaining calls to direct inflate/inflateEndJunio C Hamano2011-06-101-2/+2
| * zlib wrapper: refactor error message formatterJunio C Hamano2011-06-101-35/+38
* | Merge branch 'ak/gcc46-profile-feedback'Junio C Hamano2011-07-193-1/+36
|\ \
| * | Add explanation of the profile feedback build to the READMEAndi Kleen2011-06-201-0/+13
| * | Add profile feedback build to gitAndi Kleen2011-06-201-0/+16
| * | Add option to disable NORETURNJunio C Hamano2011-06-202-1/+7
* | | Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano2011-07-131-2/+1
|\ \ \
| * | | rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt2011-06-291-2/+1
* | | | Merge branch 'jn/doc-dashdash'Junio C Hamano2011-07-139-13/+13
|\ \ \ \
| * | | | Documentation/i18n: quote double-dash for AsciiDocJonathan Nieder2011-06-292-6/+6
| * | | | Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashJunio C Hamano2011-06-297-7/+7
| |\ \ \ \
| | * | | | Documentation: quote double-dash for AsciiDocJonathan Nieder2011-06-297-7/+7
* | | | | | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'Junio C Hamano2011-07-132-1/+23
|\ \ \ \ \ \
| * | | | | | git-submodule.sh: preserve stdin for the command spawned by foreachBrandon Casey2011-06-292-3/+7
| * | | | | | t/t7407: demonstrate that the command called by 'submodule foreach' loses stdinBrandon Casey2011-06-291-0/+18
* | | | | | | Merge branch 'nk/ref-doc'Junio C Hamano2011-07-134-30/+34
|\ \ \ \ \ \ \
| * | | | | | | glossary: clarify description of HEADJunio C Hamano2011-06-231-2/+2
| * | | | | | | glossary: update description of head and refJunio C Hamano2011-06-231-4/+5
| * | | | | | | glossary: update description of "tag"Junio C Hamano2011-06-231-8/+8
| * | | | | | | git.txt: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-4/+3
| * | | | | | | check-ref-format doc: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-3/+6
| * | | | | | | git-remote.txt: avoid sounding as if loose refs are the only ones in the worldJunio C Hamano2011-06-231-9/+10
| * | | | | | | git-remote.txt: fix wrong remote refspecNamhyung Kim2011-06-231-6/+6
* | | | | | | | Merge branch 'fk/relink-upon-ldflags-update'Junio C Hamano2011-07-132-8/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: Track changes to LDFLAGS and relink when necessaryFredrik Kuivinen2011-06-222-8/+18
* | | | | | | | | Merge branch 'jl/maint-fetch-recursive-fix'Junio C Hamano2011-07-132-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann2011-06-202-8/+9
* | | | | | | | | | Merge branch 'jc/maint-cygwin-trust-executable-bit-default'Junio C Hamano2011-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cygwin: trust executable bit by defaultJunio C Hamano2011-06-201-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'aw/rebase-i-p'Junio C Hamano2011-07-134-5/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-194-5/+30
* | | | | | | | | | | Merge branch 'rj/config-cygwin'Junio C Hamano2011-07-133-33/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config.c: Make git_config() work correctly when called recursivelyRamsay Jones2011-06-161-30/+50
| * | | | | | | | | | | t1301-*.sh: Fix the 'forced modes' test on cygwinRamsay Jones2011-06-161-2/+1
| * | | | | | | | | | | help.c: Fix detection of custom merge strategy on cygwinRamsay Jones2011-06-161-1/+4
| |/ / / / / / / / / /
* | | | | | | | | | | 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 'ln/gitweb-mime-types-split-at-blank'Junio C Hamano2011-07-131-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: allow space as delimiter in mime.typesLudwig Nussel2011-06-151-6/+3
* | | | | | | | | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc'Junio C Hamano2011-07-131-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not metJunio C Hamano2011-06-151-0/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fg/submodule-keep-updating'Junio C Hamano2011-07-133-8/+197
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-submodule.sh: clarify the "should we die now" logicJunio C Hamano2011-06-131-9/+8
| * | | | | | | | | | | | | submodule update: continue when a checkout failsFredrik Gustafsson2011-06-132-6/+188