summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-012-7/+7
* try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-011-7/+7
* try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-011-1/+0
* prepare_index(): declare return value to be (const char *)Michael Haggerty2014-10-011-2/+2
* unable_to_lock_die(): rename function from unable_to_lock_index_die()Michael Haggerty2014-10-011-1/+1
* Merge branch 'jk/mbox-from-line'Junio C Hamano2014-09-291-1/+17
|\
| * mailinfo: work around -Wstring-plus-int warningjk/mbox-from-lineEric Sunshine2014-09-221-1/+2
| * mailinfo: make ">From" in-body header check more robustJeff King2014-09-161-1/+16
* | Merge branch 'da/rev-parse-verify-quiet'Junio C Hamano2014-09-292-3/+7
|\ \
| * | refs: make rev-parse --quiet actually quietDavid Aguilar2014-09-192-3/+7
* | | Merge branch 'jk/branch-verbose-merged'Junio C Hamano2014-09-261-14/+19
|\ \ \
| * | | branch: clean up commit flags after merge-filter walkjk/branch-verbose-mergedJeff King2014-09-181-14/+19
| |/ /
* | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-268-19/+13
|\ \ \
| * | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-188-19/+13
| |/ /
* | | Merge branch 'jc/ignore-sigpipe-while-running-hooks'Junio C Hamano2014-09-261-0/+6
|\ \ \
| * | | receive-pack: allow hooks to ignore its standard input streamjc/ignore-sigpipe-while-running-hooksJunio C Hamano2014-09-161-0/+6
| | |/ | |/|
* | | Merge branch 'jk/prune-packed-server-info'Junio C Hamano2014-09-262-17/+7
|\ \ \
| * | | repack: call prune_packed_objects() and update_server_info() directlyRené Scharfe2014-09-151-17/+6
| * | | prune-packed: fix minor memory leakJeff King2014-09-151-0/+1
| |/ /
* | | Merge branch 'jc/hash-object'Junio C Hamano2014-09-261-42/+61
|\ \ \
| * | | hash-object: add --literally optionJunio C Hamano2014-09-111-9/+36
| * | | hash-object: pass 'write_object' as a flagJunio C Hamano2014-09-111-17/+15
| * | | hash-object: reduce file-scope staticsJunio C Hamano2014-09-111-29/+23
| | |/ | |/|
* | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-09-263-6/+13
|\ \ \
| * | | fsck_object(): allow passing object data separately from the object itselfJohannes Schindelin2014-09-103-6/+13
* | | | Merge branch 'jk/fsck-exit-code-fix'Junio C Hamano2014-09-191-2/+4
|\ \ \ \
| * | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-121-1/+2
| * | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-101-1/+2
* | | | | Merge branch 'mr/mark-i18n-log-rerere'Junio C Hamano2014-09-191-5/+5
|\ \ \ \ \
| * | | | | builtin/log.c: mark strings for translationmr/mark-i18n-log-rerereMatthias Ruester2014-09-151-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-191-1/+2
|\ \ \ \ \
| * | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-111-1/+2
| * | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-1/+1
* | | | | | Merge branch 'as/calloc-takes-nmemb-then-size'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \
| * | | | | | calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-sizeArjun Sreedharan2014-09-031-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/merge-tree-simplify'Junio C Hamano2014-09-191-12/+6
|\ \ \ \ \ \
| * | | | | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
| |/ / / / /
* | | | | | Merge branch 'da/styles'Junio C Hamano2014-09-191-3/+4
|\ \ \ \ \ \
| * | | | | | stylefix: asterisks stick to the variable, not the typeda/stylesDavid Aguilar2014-09-021-3/+4
| |/ / / / /
* | | | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-195-6/+6
|\ \ \ \ \ \
| * | | | | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-025-6/+6
| |/ / / / /
* | | | | | Merge branch 'jk/index-pack-threading-races'Junio C Hamano2014-09-191-2/+31
|\ \ \ \ \ \
| * | | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
* | | | | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-191-41/+48
|\ \ \ \ \ \ \
| * | | | | | | determine_author_info(): copy getenv outputjk/commit-author-parsingJeff King2014-08-291-13/+27
| * | | | | | | determine_author_info(): reuse parsing functionsJeff King2014-08-291-28/+21
| * | | | | | | date: use strbufs in date-formatting functionsJeff King2014-08-271-10/+10
* | | | | | | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-191-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strictBeat Bolli2014-08-291-0/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/fast-export-anonymize'Junio C Hamano2014-09-191-11/+289
|\ \ \ \ \ \ \ \
View Lorry Controller Status