From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Jun 2014 20:14:10 +0000 (-0700)
Subject: Merge branch 'jc/fetch-pull-refmap'
X-Git-Tag: v2.1.0-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a668853c6715b481bff347d7a08f5d885fc95f86;p=thirdparty%2Fgit.git

Merge branch 'jc/fetch-pull-refmap'

* jc/fetch-pull-refmap:
  docs: Explain the purpose of fetch's and pull's <refspec> parameter.
  fetch: allow explicit --refmap to override configuration
  fetch doc: add a section on configured remote-tracking branches
  fetch doc: remove "short-cut" section
  fetch doc: update refspec format description
  fetch doc: on pulling multiple refspecs
  fetch doc: remove notes on outdated "mixed layout"
  fetch doc: update note on '+' in front of the refspec
  fetch doc: move FETCH_HEAD material lower and add an example
  fetch doc: update introductory part for clarity
---

a668853c6715b481bff347d7a08f5d885fc95f86