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)
* 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

1  2 
builtin/receive-pack.c
cache.h
connect.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc connect.c
Simple merge