From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Feb 2013 00:05:02 +0000 (-0800)
Subject: Merge branch 'jc/mention-tracking-for-pull-default'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20a599e2c18dd5b491257d7f8aeb2d2f02221595;p=git.git

Merge branch 'jc/mention-tracking-for-pull-default'

We stopped mentioning `tracking` is a deprecated but supported
synonym for `upstream` in pull.default even though we have no
intention of removing the support for it.

* jc/mention-tracking-for-pull-default:
  doc: mention tracking for pull.default
---

20a599e2c18dd5b491257d7f8aeb2d2f02221595