Merge branch 'master' into next
Merge branch 'jk/blame-tree' into HEAD

* jk/blame-tree:
  blame-tree wip
Merge branch 'jk/builtin-attr' into HEAD

* jk/builtin-attr:
  attr: map builtin userdiff drivers to well-known extensions
Merge branch 'jk/bundle-fetch' into HEAD

* jk/bundle-fetch:
  clone: give advice on how to resume a failed clone
  remote-curl: resume interrupted bundle transfers
  remote-curl: show progress for bundle downloads
  progress: allow pure-throughput progress meters
  remote-curl: try base $URL after $URL/info/refs
  remote-curl: auto-detect bundles when fetching refs
  remote-curl: free "discovery" object
  bundle: add is_bundle_buf helper
  transport: factor out bundle to ref list conversion
  remote-curl: use http callback for requesting refs
  http: add a public function for arbitrary-callback request
  http: refactor http_request function
  http: turn off curl signals
  t/lib-httpd: check for NO_CURL

Conflicts:
	http.c
Merge branch 'jk/cache-patch-id' into HEAD

* jk/cache-patch-id:
  cache patch ids on disk
  cherry: read default config
  implement metadata cache subsystem
  map: implement persistent maps
  decorate: use "map" for the underlying implementation
  fast-export: use object to uint32 map instead of "decorate"
  map: add helper functions for objects as keys
  implement generic key/value map
Merge branch 'jk/cache-renames' into HEAD

* jk/cache-renames:
  diff: optionally use rename cache
  implement rename cache

Conflicts:
	Makefile
	metadata-cache.c
	metadata-cache.h
Merge branch 'jk/child-cleanup' into HEAD

* jk/child-cleanup:
  send-pack: kill pack-objects helper on signal or exit
Merge branch 'jk/clone-file-local' into HEAD

* jk/clone-file-local:
  clone: send diagnostic messages to stderr
Merge branch 'jk/config-sources' into HEAD

* jk/config-sources:
  show sources of config options (WIP)

Conflicts:
	builtin/config.c
Merge branch 'jk/config-warnings' into HEAD

* jk/config-warnings:
  attr: warn on inaccessible attribute files
  gitignore: report access errors of exclude files
  config: warn on inaccessible files

Conflicts:
	attr.c
	dir.c
	git-compat-util.h
	wrapper.c
Merge branch 'jk/deleted-branch-reflogs' into HEAD

* jk/deleted-branch-reflogs:
  add tests for reflogs of deleted refs
  teach sha1_name to look in graveyard reflogs
  retain reflogs for deleted refs
Merge branch 'jk/describe' into HEAD

* jk/describe:
  describe WIP
Merge branch 'jk/diff-funcname-context' into HEAD

* jk/diff-funcname-context:
  xdiff: find funcnames starting from changed lines
  t4018: drop test_config definition

Conflicts:
	t/t4018-diff-funcname.sh
Merge branch 'jk/dumpstat' into HEAD

* jk/dumpstat:
  zeromq dumpstat implementation
  dumpstat-ify upload-pack
  dumpstat to fd
  dumpstat
Merge branch 'jk/external-odb' into HEAD

* jk/external-odb:
  fetch-pack: advertise external odb blobs
  external odb foreach
  external odb work in progress
Merge branch 'jk/fast-commit-list' into HEAD

* jk/fast-commit-list:
  fetch-pack: use priority queue for mark_complete
  commit: add infrastructure for priority queues of commits
  basic priority queue implementation
Merge branch 'jk/fetch-argv-array' into HEAD

* jk/fetch-argv-array:
  argv-array: fix bogus cast when freeing array
  fetch: use argv_array instead of hand-building arrays
  argv-array: add pop function
Merge branch 'jk/fetch-tracking' into HEAD

* jk/fetch-tracking:
  fetch tracking wip
Merge branch 'jk/filter-branch-example' into HEAD

* jk/filter-branch-example:
  docs/filter-branch: clean up newsubdir example
  update-index: add --clear option
Merge branch 'jk/generations' into HEAD

* jk/generations:
  limit "contains" traversals based on commit generation
  check commit generation cache validity against grafts
  pretty: support %G to show the generation number of a commit
  commit: add commit_generation function

Conflicts:
	Makefile
	metadata-cache.c
	metadata-cache.h