From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 23:55:05 +0000 (-0800)
Subject: Merge branch 'mm/phrase-remote-tracking'
X-Git-Tag: v1.7.4-rc0~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=786f174dab50ea5333fadd1650aa709927a3099f;p=git.git

Merge branch 'mm/phrase-remote-tracking'

* mm/phrase-remote-tracking:
  git-branch.txt: mention --set-upstream as a way to change upstream configuration
  user-manual: remote-tracking can be checked out, with detached HEAD
  user-manual.txt: explain better the remote(-tracking) branch terms
  Change incorrect "remote branch" to "remote tracking branch" in C code
  Change incorrect uses of "remote branch" meaning "remote-tracking"
  Change "tracking branch" to "remote-tracking branch"
  everyday.txt: change "tracking branch" to "remote-tracking branch"
  Change remote tracking to remote-tracking in non-trivial places
  Replace "remote tracking" with "remote-tracking"
  Better "Changed but not updated" message in git-status
---

786f174dab50ea5333fadd1650aa709927a3099f