Merge branch 'jh/push-default-upstream-configname' into next
commitb5c25fa50e0d96cb5940eb55e56b01db3038146b
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800)
tree7506306cfc041da697e878c6a113aa179e1c8e40
parent52a35ce28698247dbc8c78a4602295ca1bf3620f
parent53c403116a947c538132fc721f83196036f7a299
Merge branch 'jh/push-default-upstream-configname' into next

* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'
Documentation/config.txt
cache.h