Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/realloc-array' | Junio C Hamano | 2014-09-26 | 8 | -19/+13 |
|\ | |||||
| * | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-array | René Scharfe | 2014-09-18 | 8 | -19/+13 |
* | | Merge branch 'jc/ignore-sigpipe-while-running-hooks' | Junio C Hamano | 2014-09-26 | 1 | -0/+6 |
|\ \ | |||||
| * | | receive-pack: allow hooks to ignore its standard input streamjc/ignore-sigpipe-while-running-hooks | Junio C Hamano | 2014-09-16 | 1 | -0/+6 |
* | | | Merge branch 'jk/prune-packed-server-info' | Junio C Hamano | 2014-09-26 | 2 | -17/+7 |
|\ \ \ | |||||
| * | | | repack: call prune_packed_objects() and update_server_info() directly | René Scharfe | 2014-09-15 | 1 | -17/+6 |
| * | | | prune-packed: fix minor memory leak | Jeff King | 2014-09-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | 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 | 3 | -6/+13 |
|\ \ \ | |||||
| * | | | fsck_object(): allow passing object data separately from the object itself | Johannes Schindelin | 2014-09-10 | 3 | -6/+13 |
* | | | | Merge branch 'jk/fsck-exit-code-fix' | Junio C Hamano | 2014-09-19 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fix | Jeff King | 2014-09-12 | 1 | -1/+2 |
| * | | | | fsck: exit with non-zero status upon error from fsck_obj() | Jeff King | 2014-09-10 | 1 | -1/+2 |
* | | | | | Merge branch 'mr/mark-i18n-log-rerere' | Junio C Hamano | 2014-09-19 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/log.c: mark strings for translationmr/mark-i18n-log-rerere | Matthias Ruester | 2014-09-15 | 1 | -5/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' | Junio C Hamano | 2014-09-19 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fix | Jeff King | 2014-09-11 | 1 | -1/+2 |
| * | | | | | make config --add behave correctly for empty and NULL values | Tanay Abhra | 2014-08-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'as/calloc-takes-nmemb-then-size' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-size | Arjun Sreedharan | 2014-09-03 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/merge-tree-simplify' | Junio C Hamano | 2014-09-19 | 1 | -12/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplify | René Scharfe | 2014-09-02 | 1 | -12/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'da/styles' | Junio C Hamano | 2014-09-19 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | stylefix: asterisks stick to the variable, not the typeda/styles | David Aguilar | 2014-09-02 | 1 | -3/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 | 5 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grammofix in user-facing messagesah/grammofix | Alex Henrie | 2014-09-02 | 5 | -6/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/index-pack-threading-races' | Junio C Hamano | 2014-09-19 | 1 | -2/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-races | Jeff King | 2014-08-29 | 1 | -2/+31 |
* | | | | | | | Merge branch 'jk/commit-author-parsing' | Junio C Hamano | 2014-09-19 | 1 | -41/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | determine_author_info(): copy getenv outputjk/commit-author-parsing | Jeff King | 2014-08-29 | 1 | -13/+27 |
| * | | | | | | | determine_author_info(): reuse parsing functions | Jeff King | 2014-08-29 | 1 | -28/+21 |
| * | | | | | | | date: use strbufs in date-formatting functions | Jeff King | 2014-08-27 | 1 | -10/+10 |
* | | | | | | | | Merge branch 'bb/date-iso-strict' | Junio C Hamano | 2014-09-19 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strict | Beat Bolli | 2014-08-29 | 1 | -0/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/fast-export-anonymize' | Junio C Hamano | 2014-09-19 | 1 | -11/+289 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | teach fast-export an --anonymize option | Jeff King | 2014-08-27 | 1 | -11/+289 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/send-pack-many-refspecs' | Junio C Hamano | 2014-09-19 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecs | Jeff King | 2014-08-26 | 1 | -0/+27 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' | Junio C Hamano | 2014-09-11 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch: silence git-gc if --quiet is givennd/fetch-pass-quiet-to-gc-child-process | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -0/+2 |
| * | | | | | | | fetch: convert argv_gc_auto to struct argv_array | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -4/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'dt/cache-tree-repair' | Junio C Hamano | 2014-09-11 | 2 | -1/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cache-tree: Write updated cache-tree after commit | David Turner | 2014-07-14 | 1 | -1/+17 |
| * | | | | | | | cache-tree: create/update cache-tree on checkout | David Turner | 2014-07-07 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'rs/ref-transaction-1' | Junio C Hamano | 2014-09-11 | 5 | -51/+81 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update-ref --stdin: pass transaction around explicitlyrs/ref-transaction-1 | Jonathan Nieder | 2014-09-03 | 1 | -12/+15 |
| * | | | | | | | | update-ref --stdin: narrow scope of err strbuf | Jonathan Nieder | 2014-09-03 | 1 | -1/+10 |