summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-add-relurl-wo-upstream'Junio C Hamano2011-07-223-11/+15
|\
| * submodule add: clean up duplicated codeJens Lehmann2011-06-061-9/+1
| * submodule add: allow relative repository path even when no url is setJens Lehmann2011-06-063-4/+9
| * submodule add: test failure when url is not configured in superprojectJens Lehmann2011-06-061-0/+7
* | Merge branch 'maint'Junio C Hamano2011-07-225-8/+16
|\ \
| * | doc/fast-import: clarify notemodify commandDmitry Ivankov2011-07-221-3/+8
| * | Documentation: minor grammatical fix in rev-list-options.txtJack Nagel2011-07-221-1/+1
| * | Documentation: git-filter-branch honors replacement refsPeter Collingbourne2011-07-211-2/+3
| * | remote-curl: Add a format check to parsing of info/refsJulian Phillips2011-07-201-0/+2
| * | git-config: Remove extra whitespacesPavan Kumar Sunkara2011-07-191-2/+2
* | | Update draft release notes to 1.7.7Junio C Hamano2011-07-191-2/+49
* | | Merge branch 'jc/index-pack'Junio C Hamano2011-07-1911-249/+395
|\ \ \
| * | | verify-pack: use index-pack --verifyJunio C Hamano2011-06-054-166/+27
| * | | index-pack: show histogram when emulating "verify-pack -v"Junio C Hamano2011-06-051-3/+23
| * | | index-pack: start learning to emulate "verify-pack -v"Junio C Hamano2011-06-051-3/+40
| * | | index-pack: a miniscule refactorJunio C Hamano2011-06-051-3/+8
| * | | index-pack --verify: read anomalous offsets from v2 idx fileJunio C Hamano2011-02-274-2/+74
| * | | write_idx_file: need_large_offset() helper functionJunio C Hamano2011-02-271-10/+19
| * | | index-pack: --verifyJunio C Hamano2011-02-276-17/+125
| * | | write_idx_file: introduce a struct to hold idx customization optionsJunio C Hamano2011-02-275-33/+48
| * | | index-pack: group the delta-base array entries also by typeJunio C Hamano2011-02-271-21/+40
* | | | Merge branch 'jn/mime-type-with-params'Junio C Hamano2011-07-191-1/+10
|\ \ \ \
| * | | | gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+2
| * | | | gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+9
* | | | | Merge branch 'jc/submodule-sync-no-auto-vivify'Junio C Hamano2011-07-193-30/+47
|\ \ \ \ \
| * | | | | submodule add: always initialize .git/config entryJens Lehmann2011-06-261-17/+18
| * | | | | submodule sync: do not auto-vivify uninteresting submoduleJunio C Hamano2011-06-263-13/+29
* | | | | | 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