summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2017-10-26Merge branch 'mh/ref-locking-fix'Libravatar Junio C Hamano1-0/+141
2017-10-25files_transaction_prepare(): fix handling of ref lock failureLibravatar Michael Haggerty1-8/+8
2017-10-25t1404: add a bunch of tests of D/F conflictsLibravatar Michael Haggerty1-0/+141
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Libravatar Junio C Hamano3-5/+26
2017-10-17tag: respect color.ui configLibravatar Jeff King2-0/+11
2017-10-17Revert "color: check color.ui in git_default_config()"Libravatar Jeff King1-1/+1
2017-10-17Revert "t6006: drop "always" color config tests"Libravatar Jeff King1-5/+15
2017-10-17Revert "color: make "always" the same as "auto" in config"Libravatar Jeff King1-1/+1
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Libravatar Junio C Hamano12-79/+70
2017-10-17Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano1-0/+9
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeLibravatar Jeff King1-0/+9
2017-10-11Merge branch 'sb/test-cmp-expect-actual'Libravatar Junio C Hamano14-41/+41
2017-10-11Merge branch 'jk/refs-df-conflict'Libravatar Junio C Hamano3-2/+36
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Libravatar Junio C Hamano1-0/+22
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Libravatar Junio C Hamano2-3/+89
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Libravatar Junio C Hamano1-0/+1
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Libravatar Junio C Hamano13-94/+85
2017-10-07Merge branch 'rs/qsort-s'Libravatar Junio C Hamano1-1/+1
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Libravatar Junio C Hamano1-2/+2
2017-10-07tests: fix diff order arguments in test_cmpLibravatar Stefan Beller15-42/+42
2017-10-07refs_resolve_ref_unsafe: handle d/f conflicts for writesLibravatar Jeff King2-1/+35
2017-10-07t3308: create a real ref directory/file conflictLibravatar Jeff King1-1/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()Libravatar René Scharfe1-0/+22
2017-10-05Merge branch 'ar/request-pull-phrasofix'Libravatar Junio C Hamano1-2/+2
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Libravatar Junio C Hamano1-0/+142
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersLibravatar Taylor Blau1-0/+1
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingLibravatar René Scharfe1-1/+1
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoLibravatar Junio C Hamano13-80/+71
2017-10-04t7301: use test_terminal to check colorLibravatar Jeff King1-2/+3
2017-10-04t4015: use --color with --color-movedLibravatar Jeff King1-13/+12
2017-10-04color: make "always" the same as "auto" in configLibravatar Jeff King1-0/+10
2017-10-04provide --color option for all ref-filter usersLibravatar Jeff King2-4/+4
2017-10-04t3205: use --color instead of color.branch=alwaysLibravatar Jeff King1-3/+2
2017-10-04t3203: drop "always" color testLibravatar Jeff King1-6/+0
2017-10-04t6006: drop "always" color config testsLibravatar Jeff King1-15/+5
2017-10-04t7502: use diff.noprefix for --verbose testLibravatar Jeff King1-2/+2
2017-10-04t7508: use test_terminal for color outputLibravatar Jeff King1-20/+21
2017-10-04t3701: use test-terminal to collect color outputLibravatar Jeff King1-5/+3
2017-10-04t4015: prefer --color to -c color.diff=alwaysLibravatar Jeff King1-14/+14
2017-10-04test-terminal: set TERM=vt100Libravatar Jeff King7-10/+9
2017-10-03Merge branch 'mr/doc-negative-pathspec'Libravatar Junio C Hamano1-1/+12
2017-10-03Merge branch 'sb/submodule-diff-header-fix'Libravatar Junio C Hamano1-1/+1
2017-10-03Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano6-0/+34
2017-10-03Merge branch 'sb/test-submodule-update-config'Libravatar Junio C Hamano1-0/+8
2017-10-03Merge branch 'jk/no-optional-locks'Libravatar Junio C Hamano1-0/+10
2017-10-03Merge branch 'sd/branch-copy'Libravatar Junio C Hamano1-0/+256
2017-10-03Merge branch 'bc/rev-parse-parseopt-fix'Libravatar Junio C Hamano3-3/+113
2017-10-03Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano2-19/+31
2017-10-03request-pull: capitalise "Git" to make it a proper nounLibravatar Ann T Ropea1-2/+2
2017-10-02ref-filter.c: parse trailers arguments with %(contents) atomLibravatar Taylor Blau1-0/+38