aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano2014-11-20
|\
| * color_parse: do not mention variable name in error messageJeff King2014-10-14
| * pass config slots as pointers instead of offsetsJonathan Nieder2014-10-14
* | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-20
* | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-11
|\ \
| * | clean: use f(void) instead of f() to declare a pointer to a function without ...René Scharfe2014-08-18
* | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-29
|\ \ \
| * | | pack-objects: turn off bitmaps when we split packsJeff King2014-10-19
* | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-07
|\ \ \ \ | |_|_|/ |/| | |
| * | | mailinfo: work around -Wstring-plus-int warningEric Sunshine2014-09-22
| * | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-16
* | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \
| * | | | fsck: return non-zero status on missing ref tipsJeff King2014-09-12
| * | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-10
* | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \ \
| * | | | | config: avoid a funny sentinel value "a^"Jeff King2014-09-11
| * | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-18
| | |_|/ / | |/| | |
| * | | | diff-tree: avoid lookup_unknown_objectJeff King2014-07-28
| * | | | move setting of object->type to alloc_* functionsJeff King2014-07-28
| * | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-22
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \
| * | | | | | index-pack: fix race condition with duplicate basesJeff King2014-08-29
* | | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \ \
| * | | | | | | send-pack: take refspecs over stdinJeff King2014-08-26
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \
| * | | | | | | fetch: silence git-gc if --quiet is givenNguyễn Thái Ngọc Duy2014-08-18
| * | | | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-18
* | | | | | | | Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | apply: omit ws check for excluded pathsJunio C Hamano2014-08-07
| * | | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-07
| * | | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-07
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-26
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | pack-objects: turn off bitmaps when we see --shallow linesJeff King2014-08-12
* | | | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-28
|\ \ \ \ \ \ \
| * | | | | | | apply: avoid possible bogus pointerJeff King2014-07-24
| * | | | | | | free ref string returned by dwim_refJeff King2014-07-24
| * | | | | | | receive-pack: don't copy "dir" parameterJeff King2014-07-24
* | | | | | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-27
|\ \ \ \ \ \ \ \
| * | | | | | | | replace: check mergetags when using --graftChristian Couder2014-07-21
| * | | | | | | | replace: remove signature when using --graftChristian Couder2014-07-21
| * | | | | | | | replace: add --graft optionChristian Couder2014-07-21
* | | | | | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | replace memset with string-list initializersTanay Abhra2014-07-21
* | | | | | | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use local cloning if insteadOf makes a local URLMichael Barabanov2014-07-17
* | | | | | | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tag: support configuring --sort via .gitconfigJacob Keller2014-07-17
* | | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-17
| * | | | | | | | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-17