From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:32:13 +0000 (-0700)
Subject: Merge branch 'wk/doc-clarify-upstream'
X-Git-Tag: v2.1.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8704ad33534b40e14c412f36f83f64cfcbf0359;p=thirdparty%2Fgit.git

Merge branch 'wk/doc-clarify-upstream'

* wk/doc-clarify-upstream:
  Documentation: mention config sources for @{upstream}
---

c8704ad33534b40e14c412f36f83f64cfcbf0359