summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | git-sh-setup: add die_with_statusFredrik Gustafsson2011-06-131-3/+9
| |/ / / /
* | | | | Merge branch 'jc/legacy-loose-object'Junio C Hamano2011-07-131-29/+33
|\ \ \ \ \
| * | | | | sha1_file.c: "legacy" is really the current formatJunio C Hamano2011-06-081-29/+33
* | | | | | Merge branch 'an/shallow-doc'Junio C Hamano2011-07-131-29/+74
|\ \ \ \ \ \
| * | | | | | Document the underlying protocol used by shallow repositories and --depth com...Alex Neronskiy2011-06-081-22/+66
| * | | | | | Fix documentation of fetch-pack that implies that the client can disconnect a...Alex Neronskiy2011-06-081-14/+15
* | | | | | | Start 1.7.7 cycleJunio C Hamano2011-07-063-2/+38
* | | | | | | Merge branch 'maint'Junio C Hamano2011-07-061-0/+11
|\ \ \ \ \ \ \
| * | | | | | | docs: document --textconv diff optionJeff King2011-07-061-0/+11
* | | | | | | | Merge branch 'jc/streaming-filter' into nextJunio C Hamano2011-06-297-71/+620
|\ \ \ \ \ \ \ \
| * | | | | | | | t0021: test application of both crlf and identJunio C Hamano2011-05-261-8/+24
| * | | | | | | | t0021-conversion.sh: fix NoTerminatingSymbolAtEOF testRené Scharfe2011-05-261-11/+12
| * | | | | | | | streaming: filter cascadingJunio C Hamano2011-05-261-14/+112
| * | | | | | | | streaming filter: ident filterJunio C Hamano2011-05-261-8/+169
| * | | | | | | | Add LF-to-CRLF streaming conversionJunio C Hamano2011-05-261-0/+41
| * | | | | | | | stream filter: add "no more input" to the filtersJunio C Hamano2011-05-263-4/+35
| * | | | | | | | Add streaming filter APIJunio C Hamano2011-05-265-16/+209
| * | | | | | | | convert.h: move declarations for conversion from cache.hJunio C Hamano2011-05-262-37/+45
* | | | | | | | | Merge branch 'jn/gitweb-js-blame' into nextJunio C Hamano2011-06-291-37/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb.js: use setTimeout rather than setInterval in blame_incremental.jsJakub Narebski2011-05-271-15/+40
| * | | | | | | | | gitweb.js: No need for loop in blame_incremental's handleResponse()Jakub Narebski2011-05-271-9/+4
| * | | | | | | | | gitweb.js: No need for inProgress in blame_incremental.jsJakub Narebski2011-05-271-18/+3
* | | | | | | | | | Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano2011-06-295-9/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/t7503-pre-commit-hook.sh: Add GIT_PREFIX testsDavid Aguilar2011-06-021-0/+33
| * | | | | | | | | | git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar2011-05-261-0/+7
| * | | | | | | | | | git: Remove handling for GIT_PREFIXDavid Aguilar2011-05-261-9/+1
| * | | | | | | | | | setup: Provide GIT_PREFIX to built-insDavid Aguilar2011-05-262-0/+21
* | | | | | | | | | | Merge branch 'jc/streaming' into nextJunio C Hamano2011-06-298-41/+593
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | sha1_file: use the correct type (ssize_t, not size_t) for read-style functionJim Meyering2011-05-261-1/+1
| * | | | | | | | | | streaming: read loose objects incrementallyJunio C Hamano2011-05-201-3/+82
| * | | | | | | | | | sha1_file.c: expose helpers to read loose objectsJunio C Hamano2011-05-202-3/+6