color_parse_mem: allow empty color spec

Jeff King committed over 9 years ago

.mailmap: update Gábor Szeder's email address

SZEDER Gábor committed over 9 years ago

Sync with maint

Junio C Hamano committed over 9 years ago

Ready for 2.11.1

Junio C Hamano committed over 9 years ago

Merge branch 'sb/in-core-index-doc' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'js/mingw-isatty' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jk/coding-guidelines-update' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'js/exec-path-coverity-workaround' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ad/bisect-terms' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'km/branch-get-push-while-detached' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jk/rebase-i-squash-count-fix' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jk/blame-fixes' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jk/archive-zip-userdiff-config' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'dt/disable-bitmap-in-auto-gc' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'nd/config-misc-fixes' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jc/abbrev-autoscale-config' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'mh/fast-import-notes-fix-new' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'jc/compression-config' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ew/svn-fixes' into maint

Junio C Hamano committed over 9 years ago