Signed-off-by: Junio C Hamano <gitster@pobox.com>

* rs/maint-estimate-cache-size:
  t7511: avoid use of reserved filename on Windows.

* md/smtp-tls-hello-again:
  send-email: Honour SMTP domain when using TLS

* jk/pull-rebase-with-work-tree:
  pull,rebase: handle GIT_WORK_TREE better

Conflicts:
	git-pull.sh

* jc/maint-diffstat-numstat-context:
  diff: teach --stat/--numstat to honor -U$num

* js/bisect-no-checkout:
  bisect: fix exiting when checkout failed in bisect_start()

* bc/attr-ignore-case:
  attr.c: respect core.ignorecase when matching attribute patterns
  attr: read core.attributesfile from git_default_core_config
  builtin/mv.c: plug miniscule memory leak
  cleanup: use internal memory allocation wrapper functions everywhere
  attr.c: avoid inappropriate access to strbuf "buf" member

Conflicts:
	remote.c

* cn/fetch-prune:
  fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
  fetch: honor the user-provided refspecs when pruning refs
  remote: separate out the remote_find_tracking logic into query_refspecs
  t5510: add tests for fetch --prune
  fetch: free all the additional refspecs

* sp/smart-http-failure:
  remote-curl: Fix warning after HTTP failure

* commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43':
  http: avoid empty error messages for some curl errors
  http: remove extra newline in error message