From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Feb 2011 05:58:31 +0000 (-0800)
Subject: Merge branch 'jh/push-default-upstream-configname'
X-Git-Tag: v1.7.5-rc0~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8978166e531e0941811099d4117574ebbbcf35d8;p=git.git

Merge branch 'jh/push-default-upstream-configname'

* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'
---

8978166e531e0941811099d4117574ebbbcf35d8