From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:57:26 +0000 (-0700)
Subject: Merge branch 'jk/fetch-always-update-tracking'
X-Git-Tag: v1.8.4-rc0~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db400949b31a5d2cec923b4c9da710fbdd52cca2;p=git

Merge branch 'jk/fetch-always-update-tracking'

"git fetch origin master" unlike "git fetch origin" or "git fetch"
did not update "refs/remotes/origin/master"; this was an early
design decision to keep the update of remote tracking branches
predictable, but in practice it turns out that people find it more
convenient to opportunisticly update them whenever we have a chance,
and we have been updating them when we run "git push" which already
breaks the original "predictability" anyway.

Now such a fetch does update refs/remotes/origin/master.

* jk/fetch-always-update-tracking:
  fetch: don't try to update unfetched tracking refs
  fetch: opportunistically update tracking refs
  refactor "ref->merge" flag
  fetch/pull doc: untangle meaning of bare <ref>
  t5510: start tracking-ref tests from a known state
---

db400949b31a5d2cec923b4c9da710fbdd52cca2