summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)Author
2017-10-28Merge branch 'bc/object-id' into baseMichael Haggerty
2017-10-26Merge branch 'mh/ref-locking-fix'Junio C Hamano
2017-10-25files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty
2017-10-25t1404: add a bunch of tests of D/F conflictsMichael Haggerty
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano
2017-10-17tag: respect color.ui configJeff King
2017-10-17Revert "color: check color.ui in git_default_config()"Jeff King
2017-10-17Revert "t6006: drop "always" color config tests"Jeff King
2017-10-17Revert "color: make "always" the same as "auto" in config"Jeff King
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano
2017-10-17Merge branch 'sb/diff-color-move'Junio C Hamano
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeJeff King
2017-10-16refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson
2017-10-16refs: convert peel_ref to struct object_idbrian m. carlson
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-10-16refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson
2017-10-11Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano
2017-10-11Merge branch 'jk/refs-df-conflict'Junio C Hamano
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano
2017-10-07Merge branch 'rs/qsort-s'Junio C Hamano
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller
2017-10-07refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King
2017-10-07t3308: create a real ref directory/file conflictJeff King
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe
2017-10-05Merge branch 'ar/request-pull-phrasofix'Junio C Hamano
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano
2017-10-04t7301: use test_terminal to check colorJeff King
2017-10-04t4015: use --color with --color-movedJeff King
2017-10-04color: make "always" the same as "auto" in configJeff King
2017-10-04provide --color option for all ref-filter usersJeff King
2017-10-04t3205: use --color instead of color.branch=alwaysJeff King
2017-10-04t3203: drop "always" color testJeff King
2017-10-04t6006: drop "always" color config testsJeff King
2017-10-04t7502: use diff.noprefix for --verbose testJeff King
2017-10-04t7508: use test_terminal for color outputJeff King
2017-10-04t3701: use test-terminal to collect color outputJeff King
2017-10-04t4015: prefer --color to -c color.diff=alwaysJeff King
2017-10-04test-terminal: set TERM=vt100Jeff King
2017-10-03Merge branch 'mr/doc-negative-pathspec'Junio C Hamano
2017-10-03Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano
2017-10-03Merge branch 'sb/diff-color-move'Junio C Hamano
2017-10-03Merge branch 'sb/test-submodule-update-config'Junio C Hamano
2017-10-03Merge branch 'jk/no-optional-locks'Junio C Hamano