Merge branch 'jc/mention-tracking-for-pull-default' into next
commit043624b03287437c8a359a614360985941c29e2d
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Feb 2013 07:49:25 +0000 (17 23:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Feb 2013 07:49:25 +0000 (17 23:49 -0800)
treedcd327b5ee39abd97978fa22e37ff08693226ab4
parentff03eb5b142800ae1d45137db80e4cd817a1f6c9
parentfa23348e95a3a98ca42a4b74e8f17fb52b95ded8
Merge branch 'jc/mention-tracking-for-pull-default' into next

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
Documentation/config.txt