aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* pack-objects: add list-objects filteringJeff Hostetler2017-11-22
* rev-list: add list-objects filtering supportJeff Hostetler2017-11-22
* Merge branch 'mh/ref-locking-fix'Junio C Hamano2017-10-26
|\
| * files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty2017-10-25
| * t1404: add a bunch of tests of D/F conflictsMichael Haggerty2017-10-25
* | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
|\ \
| * | tag: respect color.ui configJeff King2017-10-17
| * | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-17
| * | Revert "t6006: drop "always" color config tests"Jeff King2017-10-17
| * | Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-17
| * | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-17
| |\ \
* | \ \ Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-17
|\ \ \ \
| * | | | diff: fix infinite loop with --color-moved --ignore-space-changeJeff King2017-10-16
* | | | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-11
|\ \ \ \ \
| * | | | | tests: fix diff order arguments in test_cmpStefan Beller2017-10-07
* | | | | | Merge branch 'jk/refs-df-conflict'Junio C Hamano2017-10-11
|\ \ \ \ \ \
| * | | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King2017-10-07
| * | | | | | t3308: create a real ref directory/file conflictJeff King2017-10-07
| |/ / / / /
* | | | | | Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2017-10-11
|\ \ \ \ \ \
| * | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2017-10-06
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano2017-10-11
|\ \ \ \ \ \
| * | | | | | ref-filter.c: parse trailers arguments with %(contents) atomTaylor Blau2017-10-02
| * | | | | | ref-filter.c: use trailer_opts to format trailersTaylor Blau2017-10-02
| * | | | | | t6300: refactor %(trailers) testsTaylor Blau2017-10-02
| * | | | | | t4205: unfold across multiple linesTaylor Blau2017-10-02
* | | | | | | Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \
| * | | | | | | ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau2017-10-05
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-04
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | color: make "always" the same as "auto" in configJeff King2017-10-04
| | * | | | | | provide --color option for all ref-filter usersJeff King2017-10-04
| | * | | | | | t3205: use --color instead of color.branch=alwaysJeff King2017-10-04
| | * | | | | | t3203: drop "always" color testJeff King2017-10-04
| | * | | | | | t6006: drop "always" color config testsJeff King2017-10-04
| | * | | | | | t7502: use diff.noprefix for --verbose testJeff King2017-10-04
| | * | | | | | t7508: use test_terminal for color outputJeff King2017-10-04
| | * | | | | | t3701: use test-terminal to collect color outputJeff King2017-10-04
| | * | | | | | t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-04
| | * | | | | | test-terminal: set TERM=vt100Jeff King2017-10-04
| * | | | | | | t7301: use test_terminal to check colorJeff King2017-10-04
| * | | | | | | t4015: use --color with --color-movedJeff King2017-10-04
* | | | | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \
| * | | | | | | | test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe2017-10-04
* | | | | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2017-10-02
* | | | | | | | Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2017-10-05
|\ \ \ \ \ \ \ \
| * | | | | | | | request-pull: capitalise "Git" to make it a proper nounAnn T Ropea2017-10-03
* | | | | | | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2017-10-05
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0Eric Rannaud2017-09-29
* | | | | | | | | Merge branch 'mr/doc-negative-pathspec'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \