Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/realloc-array' | Junio C Hamano | 2014-09-26 | 28 | -70/+45 |
|\ | |||||
| * | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-array | René Scharfe | 2014-09-18 | 26 | -70/+40 |
| * | add macro REALLOC_ARRAY | René Scharfe | 2014-09-18 | 2 | -0/+5 |
* | | Merge branch 'jk/close-stderr-of-credential-cache-deamon' | Junio C Hamano | 2014-09-26 | 2 | -5/+26 |
|\ \ | |||||
| * | | credential-cache: close stderr in daemon processjk/close-stderr-of-credential-cache-deamon | Jeff King | 2014-09-16 | 2 | -5/+26 |
* | | | Merge branch 'jc/ignore-sigpipe-while-running-hooks' | Junio C Hamano | 2014-09-26 | 2 | -0/+19 |
|\ \ \ | |||||
| * | | | receive-pack: allow hooks to ignore its standard input streamjc/ignore-sigpipe-while-running-hooks | Junio C Hamano | 2014-09-16 | 2 | -0/+19 |
| |/ / | |||||
* | | | Merge branch 'jk/prune-packed-server-info' | Junio C Hamano | 2014-09-26 | 3 | -61/+86 |
|\ \ \ | |||||
| * | | | repack: call prune_packed_objects() and update_server_info() directly | René Scharfe | 2014-09-15 | 1 | -17/+6 |
| * | | | server-info: clean up after writing info/packs | Jeff King | 2014-09-15 | 1 | -0/+9 |
| * | | | make update-server-info more robust | Jeff King | 2014-09-15 | 1 | -45/+71 |
| * | | | prune-packed: fix minor memory leak | Jeff King | 2014-09-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'jc/hash-object-fsck-tag' | Junio C Hamano | 2014-09-26 | 1 | -0/+19 |
|\ \ \ | |||||
| * | | | t1450: make sure fsck detects a malformed tagger linejc/hash-object-fsck-tag | Junio C Hamano | 2014-09-12 | 1 | -0/+19 |
| * | | | Merge branch 'js/fsck-tag-validation' into HEAD | Junio C Hamano | 2014-09-12 | 9 | -20/+188 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jc/hash-object' | Junio C Hamano | 2014-09-26 | 1 | -42/+61 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | hash-object: add --literally option | Junio C Hamano | 2014-09-11 | 1 | -9/+36 |
| * | | | | hash-object: pass 'write_object' as a flag | Junio C Hamano | 2014-09-11 | 1 | -17/+15 |
| * | | | | hash-object: reduce file-scope statics | Junio C Hamano | 2014-09-11 | 1 | -29/+23 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'js/fsck-tag-validation' | Junio C Hamano | 2014-09-26 | 9 | -20/+188 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Make sure that index-pack --strict checks tag objects | Johannes Schindelin | 2014-09-12 | 1 | -0/+19 |
| * | | | Add regression tests for stricter tag fsck'ing | Johannes Schindelin | 2014-09-11 | 1 | -0/+19 |
| * | | | fsck: check tag objects' headers | Johannes Schindelin | 2014-09-11 | 1 | -1/+85 |
| * | | | Make sure fsck_commit_buffer() does not run out of the buffer | Johannes Schindelin | 2014-09-11 | 1 | -0/+23 |
| * | | | fsck_object(): allow passing object data separately from the object itself | Johannes Schindelin | 2014-09-10 | 5 | -16/+31 |
| * | | | Refactor type_from_string() to allow continuing after detecting an error | Johannes Schindelin | 2014-09-10 | 2 | -3/+11 |
* | | | | Merge branch 'jk/faster-name-conflicts' | Junio C Hamano | 2014-09-26 | 2 | -33/+120 |
|\ \ \ \ | |||||
| * | | | | refs: speed up is_refname_availablejk/faster-name-conflicts | Jeff King | 2014-09-12 | 2 | -33/+120 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/write-packed-refs-via-stdio' | Junio C Hamano | 2014-09-26 | 3 | -23/+33 |
|\ \ \ \ | |||||
| * | | | | refs: write packed_refs file using stdiojk/write-packed-refs-via-stdio | Jeff King | 2014-09-10 | 3 | -23/+33 |
| | |/ / | |/| | | |||||
* | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-09-19 | 1 | -12/+51 |
* | | | | Sync with Git 2.1.1 | Junio C Hamano | 2014-09-19 | 2 | -1/+46 |
|\ \ \ \ | |||||
| * | | | | Git 2.1.1v2.1.1 | Junio C Hamano | 2014-09-19 | 4 | -3/+48 |
| * | | | | Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maint | Junio C Hamano | 2014-09-19 | 1 | -4/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/prune-top-level-refs-after-packing' into maint | Junio C Hamano | 2014-09-19 | 2 | -1/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/fast-import-fixes' into maint | Junio C Hamano | 2014-09-19 | 1 | -8/+13 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 | 2 | -21/+27 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sp/pack-protocol-doc-on-shallow' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prompt-stash-could-be-packed' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/refresh-beyond-symlink' into maint | Junio C Hamano | 2014-09-19 | 2 | -0/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lf/bundle-exclusion' into maint | Junio C Hamano | 2014-09-19 | 2 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-prefix' into maint | Junio C Hamano | 2014-09-19 | 3 | -63/+96 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/command-line-config-empty-string' into maint | Junio C Hamano | 2014-09-19 | 3 | -2/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pretty-empty-format' into maint | Junio C Hamano | 2014-09-19 | 5 | -6/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/fsck-exit-code-fix' | Junio C Hamano | 2014-09-19 | 3 | -9/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fix | Jeff King | 2014-09-12 | 2 | -1/+58 |
| * | | | | | | | | | | | | | | | | fsck: exit with non-zero status upon error from fsck_obj() | Jeff King | 2014-09-10 | 3 | -8/+29 |
* | | | | | | | | | | | | | | | | | Merge branch 'so/rebase-doc' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-doc | Sergey Organov | 2014-09-16 | 1 | -1/+1 |