From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2011 23:47:26 +0000 (-0700)
Subject: Merge branch 'jh/push-default-upstream-configname' into maint
X-Git-Tag: v1.7.4.2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61a6f1faecf19d7727bdfae012a14747c672cb1a;p=git.git

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

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

61a6f1faecf19d7727bdfae012a14747c672cb1a