summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano
2017-10-18Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-17sequencer.c: unify an error messageRalf Thielow
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-17Crawling towards -rc2Junio C Hamano
2017-10-17Merge branch 'sb/diff-color-move'Junio C Hamano
2017-10-17Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-17Merge branch 'jc/doc-checkout'Junio C Hamano
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeJeff King
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow
2017-10-11checkout doc: clarify command line args for "checkout paths" modeJunio C Hamano
2017-10-11Git 2.15-rc1v2.15.0-rc1Junio C Hamano
2017-10-11Merge branch 'ls/filter-process-delayed'Junio C Hamano
2017-10-11Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano
2017-10-11Merge branch 'tb/complete-describe'Junio C Hamano
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/rs-mailmap'Junio C Hamano
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano
2017-10-11Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano
2017-10-11Merge branch 'hn/string-list-doc'Junio C Hamano
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano
2017-10-11Merge branch 'jt/oidmap'Junio C Hamano
2017-10-11Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano
2017-10-10write_entry: untangle symlink and regular-file casesJeff King
2017-10-09write_entry: avoid reading blobs in CE_RETRY caseJeff King
2017-10-09write_entry: fix leak when retrying delayed filterJeff King
2017-10-09cleanup: fix possible overflow errors in binary searchDerrick Stolee
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-09i18n: add a missing space in messageJean-Noel Avila
2017-10-07Prepare for -rc1Junio C Hamano
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano
2017-10-07Merge branch 'ks/verify-filename-non-option-error-message-tweak'Junio C Hamano
2017-10-07Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano
2017-10-07Merge branch 'rb/compat-poll-fix'Junio C Hamano
2017-10-07Merge branch 'tg/memfixes'Junio C Hamano
2017-10-07Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano
2017-10-07Merge branch 'rs/qsort-s'Junio C Hamano
2017-10-07Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano
2017-10-07completion: add --broken and --dirty to describeThomas Braun
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