Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/maint-submodule-unknown-cmd' | Junio C Hamano | 2012-09-29 | 3 | -4/+11 |
|\ | |||||
| * | submodule: if $command was not matched, don't parse other args | Ramkumar Ramachandra | 2012-09-25 | 3 | -4/+11 |
* | | Merge branch 'rs/archive-zip-utf8' | Junio C Hamano | 2012-09-29 | 1 | -4/+45 |
|\ \ | |||||
| * | | archive-zip: write extended timestamp | René Scharfe | 2012-09-24 | 1 | -3/+24 |
| * | | archive-zip: support UTF-8 paths | René Scharfe | 2012-09-18 | 1 | -1/+21 |
| * | | Revert "archive-zip: support UTF-8 paths" | Junio C Hamano | 2012-09-18 | 1 | -21/+6 |
| * | | archive-zip: support UTF-8 paths | René Scharfe | 2012-09-04 | 1 | -6/+21 |
* | | | Merge branch 'jk/smart-http-switch' | Junio C Hamano | 2012-09-29 | 2 | -4/+17 |
|\ \ \ | |||||
| * | | | remote-curl: let users turn off smart http | Jeff King | 2012-09-21 | 2 | -1/+14 |
| * | | | remote-curl: rename is_http variable | Jeff King | 2012-09-20 | 1 | -3/+3 |
* | | | | Merge branch 'sp/maint-http-enable-gzip' | Junio C Hamano | 2012-09-29 | 3 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | Enable info/refs gzip decompression in HTTP client | Shawn O. Pearce | 2012-09-20 | 3 | -3/+5 |
* | | | | | Merge branch 'sp/maint-http-info-refs-no-retry' | Junio C Hamano | 2012-09-29 | 1 | -16/+2 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Revert "retry request without query when info/refs?query fails" | Shawn O. Pearce | 2012-09-20 | 1 | -16/+2 |
| |/ / / | |||||
* | | | | Merge branch 'aw/rebase-i-edit-todo' | Junio C Hamano | 2012-09-29 | 4 | -16/+73 |
|\ \ \ \ | |||||
| * | | | | rebase -i: suggest using --edit-todo to fix an unknown instruction | Johannes Sixt | 2012-09-19 | 1 | -2/+3 |
| * | | | | rebase -i: Add tests for "--edit-todo" | Andrew Wong | 2012-09-17 | 1 | -0/+18 |
| * | | | | rebase -i: Teach "--edit-todo" action | Andrew Wong | 2012-09-17 | 3 | -3/+32 |
| * | | | | rebase -i: Refactor help messages for todo file | Andrew Wong | 2012-09-17 | 1 | -11/+20 |
| * | | | | rebase usage: subcommands can not be combined with -i | Martin von Zweigbergk | 2012-09-17 | 1 | -1/+1 |
* | | | | | Merge branch 'js/rebase-exec-command-not-found' | Junio C Hamano | 2012-09-29 | 2 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: fix misleading error message after 'exec no-such' instruction | Johannes Sixt | 2012-09-18 | 2 | -0/+15 |
* | | | | | | Merge branch 'rr/test-use-shell-path-not-shell' | Junio C Hamano | 2012-09-29 | 1 | -16/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-lib: use $SHELL_PATH, not $SHELL | Ramkumar Ramachandra | 2012-09-25 | 1 | -16/+16 |
* | | | | | | | Update draft release notes to 1.8.0 | Junio C Hamano | 2012-09-25 | 1 | -0/+9 |
* | | | | | | | Merge branch 'rr/test-make-sure-we-have-git' | Junio C Hamano | 2012-09-25 | 2 | -10/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/test-lib: make sure Git has already been built | Ramkumar Ramachandra | 2012-09-18 | 2 | -10/+9 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/hp-nonstop' | Junio C Hamano | 2012-09-25 | 2 | -1/+83 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Port to HP NonStop | Joachim Schmitz | 2012-09-19 | 2 | -1/+83 |
* | | | | | | | | Merge branch 'js/poll-emu' | Junio C Hamano | 2012-09-25 | 3 | -8/+26 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | make poll() work on platforms that can't recv() on a non-socket | Joachim Schmitz | 2012-09-17 | 1 | -0/+4 |
| * | | | | | | | poll() exits too early with EFAULT if 1st arg is NULL | Joachim Schmitz | 2012-09-17 | 1 | -1/+1 |
| * | | | | | | | fix some win32 specific dependencies in poll.c | Joachim Schmitz | 2012-09-17 | 1 | -2/+6 |
| * | | | | | | | make poll available for other platforms lacking it | Joachim Schmitz | 2012-09-17 | 3 | -5/+15 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ep/malloc-check-perturb' | Junio C Hamano | 2012-09-25 | 2 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | MALLOC_CHECK: various clean-ups | Junio C Hamano | 2012-09-17 | 2 | -6/+21 |
| * | | | | | | | Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detectin... | Elia Pinto | 2012-09-14 | 1 | -0/+9 |
* | | | | | | | | Merge branch 'aj/xfuncname-ada' | Junio C Hamano | 2012-09-25 | 7 | -1/+66 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add userdiff patterns for Ada | Adrian Johnson | 2012-09-16 | 7 | -1/+66 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr' | Junio C Hamano | 2012-09-25 | 6 | -4/+32 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headers | Junio C Hamano | 2012-09-17 | 6 | -4/+32 |
* | | | | | | | | | Merge branch 'po/maint-docs' | Junio C Hamano | 2012-09-25 | 5 | -15/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Doc branch: show -vv option and alternative | Philip Oakley | 2012-09-19 | 1 | -1/+3 |
| * | | | | | | | | | Doc clean: add See Also link | Philip Oakley | 2012-09-18 | 1 | -0/+4 |
| * | | | | | | | | | Doc add: link gitignore | Philip Oakley | 2012-09-18 | 1 | -1/+1 |
| * | | | | | | | | | Doc: separate gitignore pattern sources | Philip Oakley | 2012-09-18 | 1 | -12/+18 |
| * | | | | | | | | | Doc: shallow clone deepens _to_ new depth | Philip Oakley | 2012-09-18 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'db/doc-custom-xmlto' | Junio C Hamano | 2012-09-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/Makefile: Allow custom XMLTO binary | Dave Borowitz | 2012-09-19 | 1 | -2/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-25 | 1 | -8/+1 |
|\ \ \ \ \ \ \ \ \ \ |