Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/maint-fetch-recursive-fix' | Junio C Hamano | 2011-07-13 | 2 | -8/+9 |
|\ | |||||
| * | fetch: Also fetch submodules in subdirectories in on-demand mode | Jens Lehmann | 2011-06-20 | 2 | -8/+9 |
* | | Merge branch 'jc/maint-cygwin-trust-executable-bit-default' | Junio C Hamano | 2011-07-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | cygwin: trust executable bit by default | Junio C Hamano | 2011-06-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'aw/rebase-i-p' | Junio C Hamano | 2011-07-13 | 4 | -5/+30 |
|\ \ | |||||
| * | | rebase -i -p: include non-first-parent commits in todo list | Andrew Wong | 2011-06-19 | 4 | -5/+30 |
* | | | Merge branch 'rj/config-cygwin' | Junio C Hamano | 2011-07-13 | 3 | -33/+55 |
|\ \ \ | |||||
| * | | | config.c: Make git_config() work correctly when called recursively | Ramsay Jones | 2011-06-16 | 1 | -30/+50 |
| * | | | t1301-*.sh: Fix the 'forced modes' test on cygwin | Ramsay Jones | 2011-06-16 | 1 | -2/+1 |
| * | | | help.c: Fix detection of custom merge strategy on cygwin | Ramsay Jones | 2011-06-16 | 1 | -1/+4 |
| |/ / | |||||
* | | | Merge branch 'md/interix-update' | Junio C Hamano | 2011-07-13 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | Update the Interix default build configuration. | Markus Duft | 2011-06-15 | 1 | -2/+4 |
* | | | | Merge branch 'ln/gitweb-mime-types-split-at-blank' | Junio C Hamano | 2011-07-13 | 1 | -6/+3 |
|\ \ \ \ | |||||
| * | | | | gitweb: allow space as delimiter in mime.types | Ludwig Nussel | 2011-06-15 | 1 | -6/+3 |
* | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' | Junio C Hamano | 2011-07-13 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met | Junio C Hamano | 2011-06-15 | 1 | -0/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fg/submodule-keep-updating' | Junio C Hamano | 2011-07-13 | 3 | -8/+197 |
|\ \ \ \ \ | |||||
| * | | | | | git-submodule.sh: clarify the "should we die now" logic | Junio C Hamano | 2011-06-13 | 1 | -9/+8 |
| * | | | | | submodule update: continue when a checkout fails | Fredrik Gustafsson | 2011-06-13 | 2 | -6/+188 |
| * | | | | | git-sh-setup: add die_with_status | Fredrik Gustafsson | 2011-06-13 | 1 | -3/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/legacy-loose-object' | Junio C Hamano | 2011-07-13 | 1 | -29/+33 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_file.c: "legacy" is really the current format | Junio C Hamano | 2011-06-08 | 1 | -29/+33 |
* | | | | | | Merge branch 'an/shallow-doc' | Junio C Hamano | 2011-07-13 | 1 | -29/+74 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Document the underlying protocol used by shallow repositories and --depth com... | Alex Neronskiy | 2011-06-08 | 1 | -22/+66 |
| * | | | | | | Fix documentation of fetch-pack that implies that the client can disconnect a... | Alex Neronskiy | 2011-06-08 | 1 | -14/+15 |
* | | | | | | | Start 1.7.7 cycle | Junio C Hamano | 2011-07-06 | 3 | -2/+38 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-07-06 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs: document --textconv diff option | Jeff King | 2011-07-06 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'jc/streaming-filter' into next | Junio C Hamano | 2011-06-29 | 7 | -71/+620 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0021: test application of both crlf and ident | Junio C Hamano | 2011-05-26 | 1 | -8/+24 |
| * | | | | | | | | t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test | René Scharfe | 2011-05-26 | 1 | -11/+12 |
| * | | | | | | | | streaming: filter cascading | Junio C Hamano | 2011-05-26 | 1 | -14/+112 |
| * | | | | | | | | streaming filter: ident filter | Junio C Hamano | 2011-05-26 | 1 | -8/+169 |
| * | | | | | | | | Add LF-to-CRLF streaming conversion | Junio C Hamano | 2011-05-26 | 1 | -0/+41 |
| * | | | | | | | | stream filter: add "no more input" to the filters | Junio C Hamano | 2011-05-26 | 3 | -4/+35 |
| * | | | | | | | | Add streaming filter API | Junio C Hamano | 2011-05-26 | 5 | -16/+209 |
| * | | | | | | | | convert.h: move declarations for conversion from cache.h | Junio C Hamano | 2011-05-26 | 2 | -37/+45 |
* | | | | | | | | | Merge branch 'jn/gitweb-js-blame' into next | Junio C Hamano | 2011-06-29 | 1 | -37/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb.js: use setTimeout rather than setInterval in blame_incremental.js | Jakub Narebski | 2011-05-27 | 1 | -15/+40 |
| * | | | | | | | | | gitweb.js: No need for loop in blame_incremental's handleResponse() | Jakub Narebski | 2011-05-27 | 1 | -9/+4 |
| * | | | | | | | | | gitweb.js: No need for inProgress in blame_incremental.js | Jakub Narebski | 2011-05-27 | 1 | -18/+3 |
* | | | | | | | | | | Merge branch 'da/git-prefix-everywhere' into next | Junio C Hamano | 2011-06-29 | 5 | -9/+62 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests | David Aguilar | 2011-06-02 | 1 | -0/+33 |
| * | | | | | | | | | | git-mergetool--lib: Make vimdiff retain the current directory | David Aguilar | 2011-05-26 | 1 | -0/+7 |
| * | | | | | | | | | | git: Remove handling for GIT_PREFIX | David Aguilar | 2011-05-26 | 1 | -9/+1 |
| * | | | | | | | | | | setup: Provide GIT_PREFIX to built-ins | David Aguilar | 2011-05-26 | 2 | -0/+21 |
* | | | | | | | | | | | Merge branch 'jc/streaming' into next | Junio C Hamano | 2011-06-29 | 8 | -41/+593 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | sha1_file: use the correct type (ssize_t, not size_t) for read-style function | Jim Meyering | 2011-05-26 | 1 | -1/+1 |
| * | | | | | | | | | | streaming: read loose objects incrementally | Junio C Hamano | 2011-05-20 | 1 | -3/+82 |
| * | | | | | | | | | | sha1_file.c: expose helpers to read loose objects | Junio C Hamano | 2011-05-20 | 2 | -3/+6 |