Merge branch 'jc/capabilities' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:06:45 +0000 (11:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:06:45 +0000 (11:06 -0700)
commit59d7cbd343d098783f8a91fb67d90ac3d066ea77
treef3655aec189b8c190b366c7616632cb7e83454b9
parent2af6d98a5e85ede052c46ab8d35f77e5ad4ae804
parent36c60f7a08b28e2cee649d697291ac6b708b213f
Merge branch 'jc/capabilities' into maint

* jc/capabilities:
  fetch-pack: mention server version with verbose output
  parse_feature_request: make it easier to see feature values
  fetch-pack: do not ask for unadvertised capabilities
  do not send client agent unless server does first
  send-pack: fix capability-sending logic
  include agent identifier in capability string
builtin/receive-pack.c
cache.h
connect.c