summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-231-1/+1
|\
| * avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-1/+1
* | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2017-10-231-0/+142
|\ \
| * | fast-import: checkpoint: dump branches/tags/marks even if object_count==0er/fast-import-dump-refs-on-checkpointEric Rannaud2017-09-291-0/+142
| |/
* | Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-231-1/+19
|\ \
| * | fast-export: do not copy from modified filejt/fast-export-copy-modify-fixJonathan Tan2017-09-211-1/+19
* | | Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano2017-10-231-0/+13
|\ \ \
| * | | branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-241-0/+13
* | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-1812-62/+74
|\ \ \ \
| * | | | tag: respect color.ui configjk/ref-filter-colors-fixJeff King2017-10-172-0/+11
| * | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-1/+1
| * | | | 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-171-1/+1
| * | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-1712-79/+70
| |\ \ \ \
| | * | | | color: make "always" the same as "auto" in configJeff King2017-10-041-0/+10
| | * | | | provide --color option for all ref-filter usersJeff King2017-10-042-4/+4
| | * | | | 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
| | * | | | t7508: use test_terminal for color outputJeff King2017-10-041-20/+21
| | * | | | t3701: use test-terminal to collect color outputJeff King2017-10-041-5/+3
| | * | | | t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
| | * | | | test-terminal: set TERM=vt100Jeff King2017-10-047-10/+9
* | | | | | Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2017-10-181-0/+22
|\ \ \ \ \ \
| * | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()rs/fsck-null-return-from-lookupRené Scharfe2017-10-061-0/+22
| |/ / / / /
* | | | | | Merge branch 'rs/qsort-s' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \
| * | | | | | test-stringlist: avoid buffer underrun when sorting nothingrs/qsort-sRené Scharfe2017-10-041-1/+1
* | | | | | | Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano2017-10-181-1/+12
|\ \ \ \ \ \ \
| * | | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-251-1/+12
* | | | | | | | Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano2017-10-181-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofixKaartic Sivaraam2017-09-191-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano2017-10-182-11/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: drop experimental GIT_USE_LOOKUP searchJeff King2017-08-092-11/+1
* | | | | | | | | Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2017-10-181-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-051-0/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2017-10-181-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-031-2/+2
* | | | | | | | | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-181-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-221-0/+5
* | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-171-1/+5
* | | | | | | | | | | | Merge branch 'tb/test-lint-echo-e' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lint: echo -e (or -E) is not portabletb/test-lint-echo-eTorsten Bögershausen2017-09-211-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2017-10-183-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | archive: don't add empty directories to archivesrs/archive-excluded-directoryRené Scharfe2017-09-143-4/+4
* | | | | | | | | | | | | Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-181-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-parse: don't trim bisect refnamesmh/packed-ref-store-prepJeff King2017-09-071-2/+16
* | | | | | | | | | | | | | Merge branch 'mm/send-email-cc-cruft' into maintJunio C Hamano2017-10-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | send-email: fix garbage removal after addressMatthieu Moy2017-08-241-0/+4
View Lorry Controller Status