summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Libravatar Junio C Hamano12-32/+62
2017-10-18Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-1/+1
2017-10-18sequencer.c: unify an error messageLibravatar Ralf Thielow1-1/+1
2017-10-17tag: respect color.ui configLibravatar Jeff King3-1/+12
2017-10-17Revert "color: check color.ui in git_default_config()"Libravatar Jeff King8-9/+17
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 King3-19/+20
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Libravatar Junio C Hamano18-98/+100
2017-10-17Crawling towards -rc2Libravatar Junio C Hamano1-0/+1
2017-10-17Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano2-13/+24
2017-10-17Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-2/+2
2017-10-17Merge branch 'jc/doc-checkout'Libravatar Junio C Hamano1-14/+16
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeLibravatar Jeff King2-13/+24
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Libravatar Ralf Thielow1-2/+2
2017-10-11checkout doc: clarify command line args for "checkout paths" modeLibravatar Junio C Hamano1-14/+16
2017-10-11Git 2.15-rc1Libravatar Junio C Hamano2-1/+18
2017-10-11Merge branch 'ls/filter-process-delayed'Libravatar Junio C Hamano1-36/+52
2017-10-11Merge branch 'ds/avoid-overflow-in-midpoint-computation'Libravatar Junio C Hamano12-15/+15
2017-10-11Merge branch 'tb/complete-describe'Libravatar Junio C Hamano1-1/+1
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 Hamano4-3/+50
2017-10-11Merge branch 'rs/rs-mailmap'Libravatar Junio C Hamano1-0/+1
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Libravatar Junio C Hamano2-4/+26
2017-10-11Merge branch 'jk/sha1-loose-object-info-fix'Libravatar Junio C Hamano1-2/+6
2017-10-11Merge branch 'hn/string-list-doc'Libravatar Junio C Hamano1-1/+1
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Libravatar Junio C Hamano4-17/+122
2017-10-11Merge branch 'jt/oidmap'Libravatar Junio C Hamano6-31/+133
2017-10-11Merge branch 'jr/hash-migration-plan-doc'Libravatar Junio C Hamano2-0/+798
2017-10-10write_entry: untangle symlink and regular-file casesLibravatar Jeff King1-31/+40
2017-10-10write_entry: avoid reading blobs in CE_RETRY caseLibravatar Jeff King1-11/+14
2017-10-10write_entry: fix leak when retrying delayed filterLibravatar Jeff King1-0/+1
2017-10-10cleanup: fix possible overflow errors in binary searchLibravatar Derrick Stolee12-15/+15
2017-10-09Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-1/+1
2017-10-09i18n: add a missing space in messageLibravatar Jean-Noel Avila1-1/+1
2017-10-07Prepare for -rc1Libravatar Junio C Hamano1-3/+38
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Libravatar Junio C Hamano2-1/+10
2017-10-07Merge branch 'ks/verify-filename-non-option-error-message-tweak'Libravatar Junio C Hamano1-1/+1
2017-10-07Merge branch 'ks/branch-tweak-error-message-for-extra-args'Libravatar Junio C Hamano1-3/+3
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Libravatar Junio C Hamano19-113/+115
2017-10-07Merge branch 'ma/builtin-unleak'Libravatar Junio C Hamano5-4/+11
2017-10-07Merge branch 'rb/compat-poll-fix'Libravatar Junio C Hamano1-0/+4
2017-10-07Merge branch 'tg/memfixes'Libravatar Junio C Hamano3-8/+6
2017-10-07Merge branch 'sb/branch-avoid-repeated-strbuf-release'Libravatar Junio C Hamano1-2/+3
2017-10-07Merge branch 'rs/qsort-s'Libravatar Junio C Hamano1-1/+1
2017-10-07Merge branch 'jn/strbuf-doc-re-reuse'Libravatar Junio C Hamano1-2/+9
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Libravatar Junio C Hamano2-7/+30
2017-10-07completion: add --broken and --dirty to describeLibravatar Thomas Braun1-1/+1
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 King3-2/+49
2017-10-07t3308: create a real ref directory/file conflictLibravatar Jeff King1-1/+1