Merge branch 'jh/push-default-upstream-configname'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:31 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:31 +0000 (21:58 -0800)
commit8978166e531e0941811099d4117574ebbbcf35d8
tree97c222b3705ea1980557ae1f96dda1d272625a83
parentfbfeeaf29480a3299fa6c3349b7a8c1b147c18c5
parent53c403116a947c538132fc721f83196036f7a299
Merge branch 'jh/push-default-upstream-configname'

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