summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-071-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 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-291-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 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-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
| * | | 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
| |\ \ \
* | \ \ \ Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-291-2/+31
|\ \ \ \ \
| * | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
* | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-291-0/+27
|\ \ \ \ \ \
| * | | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-261-0/+27
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-191-4/+6
|\ \ \ \ \ \
| * | | | | | fetch: silence git-gc if --quiet is givennd/fetch-pass-quiet-to-gc-child-processNguyễn Thái Ngọc Duy2014-08-181-0/+2
| * | | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-181-4/+4
* | | | | | | Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-191-63/+68
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-071-3/+6
| * | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43
| * | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-071-22/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-261-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-121-0/+1
* | | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-284-3/+5
|\ \ \ \ \ \
| * | | | | | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
| * | | | | | free ref string returned by dwim_refJeff King2014-07-242-0/+2
| * | | | | | receive-pack: don't copy "dir" parameterJeff King2014-07-241-2/+2
* | | | | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-271-1/+125
|\ \ \ \ \ \ \
| * | | | | | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | | | | | replace: remove signature when using --graftChristian Couder2014-07-211-0/+5
| * | | | | | | replace: add --graft optionChristian Couder2014-07-211-1/+73
* | | | | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-2/+1
* | | | | | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-231-12/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadofMichael Barabanov2014-07-171-12/+13
* | | | | | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-231-18/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-171-18/+50
* | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-223-19/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-172-18/+3
| * | | | | | | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-171-1/+1
* | | | | | | | | | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-222-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-idJeff King2014-07-131-3/+1
| * | | | | | | | | | | | move setting of object->type to alloc_* functionsJeff King2014-07-131-1/+0
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | trace: improve trace performanceKarsten Blees2014-07-131-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-214-11/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
View Lorry Controller Status