summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/archive-tar-filter'Junio C Hamano2011-07-198-73/+375
|\
| * upload-archive: allow user to turn off filtersJeff King2011-06-228-13/+49
| * archive: provide builtin .tar.gz filterJeff King2011-06-223-0/+51
| * archive: implement configurable tar filtersJeff King2011-06-223-1/+165
| * archive: refactor file extension format-guessingJeff King2011-06-221-6/+19
| * archive: move file extension format-guessing lowerJeff King2011-06-224-41/+41
| * archive: pass archiver struct to write_archive callbackJeff King2011-06-224-4/+7
| * archive: refactor list of archive formatsJeff King2011-06-224-27/+52
| * archive-tar: don't reload default config optionsJeff King2011-06-221-1/+1
| * archive: reorder option parsing and config readingJeff King2011-06-151-4/+14
* | Merge branch 'jn/gitweb-split-header-html'Junio C Hamano2011-07-191-77/+95
|\ \
| * | gitweb: Refactor git_header_htmlJakub Narebski2011-06-221-77/+95
* | | Merge branch 'jk/clone-cmdline-config'Junio C Hamano2011-07-1910-15/+121
|\ \ \
| * | | clone: accept config options on the command lineJeff King2011-06-223-1/+71
| * | | config: make git_config_parse_parameter a public functionJeff King2011-06-222-2/+4
| * | | remote: use new OPT_STRING_LISTJeff King2011-06-221-12/+2
| * | | parse-options: add OPT_STRING_LIST helperJeff King2011-06-224-0/+44
* | | | Merge branch 'jk/maint-config-param'Junio C Hamano2011-07-194-11/+47
|\ \ \ \ | |/ / /
| * | | config: use strbuf_split_str instead of a temporary strbufJeff King2011-06-221-3/+1
| * | | strbuf: allow strbuf_split to work on non-strbufsJeff King2011-06-222-7/+17
| * | | config: avoid segfault when parsing command-line configJeff King2011-06-222-0/+6
| * | | config: die on error in command-line configJeff King2011-06-222-1/+9
| * | | fix "git -c" parsing of values with equals signsJeff King2011-06-222-1/+7
| * | | strbuf_split: add a max parameterJeff King2011-06-222-3/+11
* | | | Merge branch 'jk/tag-list-multiple-patterns'Junio C Hamano2011-07-193-12/+28
|\ \ \ \
| * | | | tag: accept multiple patterns for --listJeff King2011-06-203-12/+28
* | | | | 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