summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.14.3v2.14.3maint-2.14Junio C Hamano2017-10-232-1/+25
* Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-10-231-20/+11
|\
| * read_info_alternates: warn on non-trivial errorsJeff King2017-09-201-0/+1
| * Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fixJunio C Hamano2017-09-201-20/+10
| |\
| | * read_info_alternates: read contents into strbufjk/info-alternates-fix-2.11Jeff King2017-09-201-20/+10
* | | Merge branch 'jc/fetch-refspec-doc-update' into maintJunio C Hamano2017-10-231-2/+4
|\ \ \
| * | | fetch doc: src side of refspec could be full SHA-1jc/fetch-refspec-doc-updateJunio C Hamano2017-10-181-2/+4
* | | | Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-2322-67/+65
|\ \ \ \
| * | | | read_pack_header: handle signed/unsigned comparison in read resultjk/write-in-full-fixJeff King2017-09-141-1/+1
| * | | | config: flip return value of store_write_*()Jeff King2017-09-141-13/+15
| * | | | notes-merge: use ssize_t for write_in_full() return valueJeff King2017-09-141-1/+1
| * | | | pkt-line: check write_in_full() errors against "< 0"Jeff King2017-09-141-15/+14
| * | | | convert less-trivial versions of "write_in_full() != len"Jeff King2017-09-143-4/+5
| * | | | avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-1416-27/+26
| * | | | get-tar-commit-id: check write_in_full() return against 0Jeff King2017-09-141-2/+1
| * | | | config: avoid "write_in_full(fd, buf, len) < len" patternJeff King2017-09-141-4/+2
| | |/ / | |/| |
* | | | Merge branch 'rj/no-sign-compare' into maintJunio C Hamano2017-10-2310-24/+25
|\ \ \ \
| * | | | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compareRamsay Jones2017-09-227-17/+16
| * | | | cache.h: hex2chr() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+2
| * | | | commit-slab.h: avoid -Wsign-compare warningsRamsay Jones2017-09-221-3/+3
| * | | | git-compat-util.h: xsize_t() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+4
| |/ / /
* | | | Merge branch 'ma/ts-cleanups' into maintJunio C Hamano2017-10-236-3/+37
|\ \ \ \
| * | | | ThreadSanitizer: add suppressionsma/ts-cleanupsMartin Ågren2017-08-233-0/+24
| * | | | strbuf_setlen: don't write to strbuf_slopbufMartin Ågren2017-08-231-1/+4
| * | | | pack-objects: take lock before accessing `remaining`Martin Ågren2017-08-231-0/+6
| * | | | convert: always initialize attr_action in convert_attrsMartin Ågren2017-08-231-2/+3
* | | | | Merge branch 'ls/travis-scriptify' into maintJunio C Hamano2017-10-2310-81/+154
|\ \ \ \ \
| * | | | | travis-ci: fix "skip_branch_tip_with_tag()" string comparisonls/travis-scriptifyLars Schneider2017-09-221-1/+1
| * | | | | travis: dedent a few scripts that are indented overly deeplyJunio C Hamano2017-09-112-33/+36
| * | | | | travis-ci: skip a branch build if equal tag is presentLars Schneider2017-09-111-0/+23
| * | | | | travis-ci: move Travis CI code into dedicated scriptsLars Schneider2017-09-1110-81/+128
* | | | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2017-10-232-3/+145
|\ \ \ \ \ \
| * | | | | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0er/fast-import-dump-refs-on-checkpointEric Rannaud2017-09-292-3/+145
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-232-15/+51
|\ \ \ \ \ \
| * | | | | | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-212-15/+51
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano2017-10-233-3/+17
|\ \ \ \ \ \
| * | | | | | branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-243-3/+17
* | | | | | | Prepare for 2.14.3Junio C Hamano2017-10-182-1/+76
* | | | | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-1823-71/+103
|\ \ \ \ \ \ \
| * | | | | | | tag: respect color.ui configjk/ref-filter-colors-fixJeff King2017-10-173-1/+12
| * | | | | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-178-9/+17
| * | | | | | | Revert "t6006: drop "always" color config tests"Jeff King2017-10-171-5/+15
| * | | | | | | Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-173-19/+20
| * | | | | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-1718-98/+100
| |\ \ \ \ \ \ \
| | * | | | | | | color: make "always" the same as "auto" in configJeff King2017-10-043-19/+28
| | * | | | | | | provide --color option for all ref-filter usersJeff King2017-10-046-4/+16
| | * | | | | | | t3205: use --color instead of color.branch=alwaysJeff King2017-10-041-3/+2
| | * | | | | | | t3203: drop "always" color testJeff King2017-10-041-6/+0
| | * | | | | | | t6006: drop "always" color config testsJeff King2017-10-041-15/+5
| | * | | | | | | t7502: use diff.noprefix for --verbose testJeff King2017-10-041-2/+2