summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* log.c: fix translation markingskm/log-usage-string-i18nKyle J. McKay2015-01-061-2/+2
* diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maintJeff King2014-07-281-3/+1
* move setting of object->type to alloc_* functionsJeff King2014-07-281-1/+0
* Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-222-5/+5
|\
| * builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
* | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-212-7/+2
* | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-212-4/+2
* | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-161-1/+1
|\ \
| * | builtin/clone.c: detect a clone starting at a tag correctlyjc/fix-clone-single-starting-at-a-tagJunio C Hamano2014-06-231-1/+1
* | | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-1611-29/+47
|\ \ \
| * | | commit: record buffer length in cacheJeff King2014-06-136-6/+18
| * | | use get_commit_buffer everywhereJeff King2014-06-133-4/+13
| * | | convert logmsg_reencode to get_commit_bufferJeff King2014-06-132-3/+3
| * | | use get_cached_commit_buffer where appropriateJeff King2014-06-131-1/+1
| * | | provide a helper to set the commit bufferJeff King2014-06-131-1/+1
| * | | provide a helper to free commit bufferJeff King2014-06-134-9/+6
| * | | logmsg_reencode: return const bufferJeff King2014-06-122-2/+2
| * | | do not create "struct commit" with xcallocJeff King2014-06-121-1/+1
| * | | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-123-8/+8
| | |/ | |/|
* | | Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-161-7/+5
|\ \ \
| * \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-162-8/+6
| |\ \ \ | | |_|/ | |/| |
| | * | annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
* | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-101-5/+9
|\ \ \ \
| * | | | repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objectsJeff King2014-06-101-6/+6
| * | | | repack: respect pack.writebitmapsJeff King2014-06-101-1/+5
| * | | | repack: do not accidentally pack kept objects by defaultJeff King2014-06-101-1/+1
* | | | | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+16
|\ \ \ \ \
| * | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-2/+16
* | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \
| * | | | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-101-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-251-7/+30
|\ \ \ \ \ \
| * | | | | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-pruneJens Lindström2014-05-271-1/+6
| * | | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-271-2/+18
| * | | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-231-4/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-251-0/+2
|\ \ \ \ \ \
| * | | | | | rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-1/+2
|\ \ \ \ \ \
| * | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-081-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-251-3/+3
|\ \ \ \ \ \
| * | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmpRené Scharfe2014-06-021-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-251-2/+7
|\ \ \ \ \ \
| * | | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-096-8/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-085-17/+38
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-0/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status