Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lockfile: change lock_file::filename into a strbuf | Michael Haggerty | 2014-10-01 | 2 | -7/+7 |
* | try_merge_strategy(): use a statically-allocated lock_file object | Michael Haggerty | 2014-10-01 | 1 | -7/+7 |
* | try_merge_strategy(): remove redundant lock_file allocation | Michael Haggerty | 2014-10-01 | 1 | -1/+0 |
* | prepare_index(): declare return value to be (const char *) | Michael Haggerty | 2014-10-01 | 1 | -2/+2 |
* | unable_to_lock_die(): rename function from unable_to_lock_index_die() | Michael Haggerty | 2014-10-01 | 1 | -1/+1 |
* | Merge branch 'jk/mbox-from-line' | Junio C Hamano | 2014-09-29 | 1 | -1/+17 |
|\ | |||||
| * | mailinfo: work around -Wstring-plus-int warning | Eric Sunshine | 2014-09-22 | 1 | -1/+2 |
| * | mailinfo: make ">From" in-body header check more robust | Jeff King | 2014-09-16 | 1 | -1/+16 |
* | | Merge branch 'da/rev-parse-verify-quiet' | Junio C Hamano | 2014-09-29 | 2 | -3/+7 |
|\ \ | |||||
| * | | refs: make rev-parse --quiet actually quiet | David Aguilar | 2014-09-19 | 2 | -3/+7 |
* | | | Merge branch 'jk/branch-verbose-merged' | Junio C Hamano | 2014-09-26 | 1 | -14/+19 |
|\ \ \ | |||||
| * | | | branch: clean up commit flags after merge-filter walk | Jeff King | 2014-09-18 | 1 | -14/+19 |
| |/ / | |||||
* | | | Merge branch 'rs/realloc-array' | Junio C Hamano | 2014-09-26 | 8 | -19/+13 |
|\ \ \ | |||||
| * | | | use REALLOC_ARRAY for changing the allocation size of arrays | 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 stream | Junio C Hamano | 2014-09-17 | 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 tips | 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 translation | 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^" | Jeff King | 2014-09-12 | 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 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 arguments | 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 type | 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 messages | 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 bases | 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 output | 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 format | Beat Bolli | 2014-08-29 | 1 | -0/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/fast-export-anonymize' | Junio C Hamano | 2014-09-19 | 1 | -11/+289 |
|\ \ \ \ \ \ \ \ |