summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* completion: add remaining flags to checkouttb/complete-checkoutThomas Braun2017-10-251-0/+4
* Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-183-5/+26
|\
| * 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
| |\
* | \ Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-171-0/+9
|\ \ \
| * | | diff: fix infinite loop with --color-moved --ignore-space-changesb/diff-color-moveJeff King2017-10-161-0/+9
* | | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-1114-41/+41
|\ \ \ \
| * | | | tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actualStefan Beller2017-10-0715-42/+42
* | | | | Merge branch 'jk/refs-df-conflict'Junio C Hamano2017-10-113-2/+36
|\ \ \ \ \
| * | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflictJeff King2017-10-072-1/+35
| * | | | | t3308: create a real ref directory/file conflictJeff King2017-10-071-1/+1
| |/ / / /
* | | | | Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2017-10-111-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 'tb/show-trailers-in-ref-filter'Junio C Hamano2017-10-112-3/+89
|\ \ \ \ \
| * | | | | ref-filter.c: parse trailers arguments with %(contents) atomtb/show-trailers-in-ref-filterTaylor Blau2017-10-021-0/+38
| * | | | | ref-filter.c: use trailer_opts to format trailersTaylor Blau2017-10-021-0/+41
| * | | | | t6300: refactor %(trailers) testsTaylor Blau2017-10-021-2/+9
| * | | | | t4205: unfold across multiple linesTaylor Blau2017-10-021-1/+1
* | | | | | Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2017-10-071-0/+1
|\ \ \ \ \ \
| * | | | | | ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-051-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-0713-94/+85
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-0413-80/+71
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 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
| * | | | | | t7301: use test_terminal to check colorJeff King2017-10-041-2/+3
| * | | | | | t4015: use --color with --color-movedJeff King2017-10-041-13/+12
* | | | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-10-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | test-stringlist: avoid buffer underrun when sorting nothingrs/qsort-sRené Scharfe2017-10-041-1/+1
* | | | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-10-071-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2017-10-021-2/+2
* | | | | | | Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2017-10-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-031-2/+2
* | | | | | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2017-10-051-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 'mr/doc-negative-pathspec'Junio C Hamano2017-10-031-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-251-1/+12
* | | | | | | | | Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2017-10-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: correct error message for missing commitssb/submodule-diff-header-fixStefan Beller2017-09-281-1/+1
* | | | | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-036-0/+34
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
View Lorry Controller Status