Merge branch 'jk/archive-reachability' into HEAD

* jk/archive-reachability:
  archive: ignore blob objects when checking reachability
  list-objects: optimize "revs->blob_objects = 0" case
  upload-archive: restrict remote objects with reachability check
  clear parsed flag when we free tree buffers
Merge branch 'jk/blame-tree' into HEAD

* jk/blame-tree:
  add blame-tree command
  combine-diff: zero memory used for callback filepairs
  teach tree-diff a max-depth parameter
  within_depth: fix return for empty path
Merge branch 'jk/bogus-ident-segfault' into HEAD

* jk/bogus-ident-segfault:
  fsck: check "tagger" lines
  skip_prefix: return a non-const pointer
Merge branch 'jk/builtin-attr' into HEAD

* jk/builtin-attr:
  attr: map builtin userdiff drivers to well-known extensions
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)
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

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/fetch-many-refs' into HEAD

* jk/fetch-many-refs:
  fetch-pack: avoid quadratic behavior in rev_list_push
  commit.c: make compare_commits_by_commit_date global
  fetch-pack: avoid quadratic list insertion in mark_complete
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/format-patch-from' into HEAD

* jk/format-patch-from:
  teach format-patch to place other authors into in-body "From"
  pretty.c: drop const-ness from pretty_print_context

Conflicts:
	log-tree.c
Merge branch 'jk/git-dir-debug' into HEAD

* jk/git-dir-debug:
  add GIT_TRACE_GITDIR
Merge branch 'jk/httpd-tests' into HEAD

* jk/httpd-tests:
  t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
  t/lib-httpd/apache.conf: load compat access module in apache 2.4
  t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
Merge branch 'jk/ident' into HEAD

* jk/ident:
  commit: give a hint when a commit message has been abandoned
Merge branch 'jk/ignore-have' into HEAD

* jk/ignore-have:
  receive-pack: respect receive.advertiseAlternates config
Merge branch 'jk/logallrefupdates' into HEAD

* jk/logallrefupdates:
  teach core.logallrefupdates an "always" mode
Merge branch 'jk/metapacks' into HEAD

* jk/metapacks:
  avoid segfault on empty metapacks
  warning fixups for duys patch
  introduce a commit metapack
  commit: look up commit info in metapack
  add git-metapack command
  introduce a commit metapack
  introduce pack metadata cache files
  strbuf: add string-chomping functions
  csum-file: make sha1write const-correct
Merge branch 'jk/pack-objects-cache' into HEAD

* jk/pack-objects-cache:
  pack-objects: optionally cache "counting objects" phase