diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:55:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:55:05 +0300 |
| commit | 786f174dab50ea5333fadd1650aa709927a3099f (patch) | |
| tree | 6a4a40b08368f017026473c620e028dfb7697f23 /contrib | |
| parent | b3ff808b714fd8fc5e4d2770720398e5dc7d27f9 (diff) | |
| parent | 4eec6f988dc1638ff5b5ee3131f7452d29042a61 (diff) | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/examples/builtin-fetch--tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c index cd10dbcbc9..3140e405fa 100644 --- a/contrib/examples/builtin-fetch--tool.c +++ b/contrib/examples/builtin-fetch--tool.c @@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp, what = remote_name + 10; } else if (!strncmp(remote_name, "refs/remotes/", 13)) { - kind = "remote branch"; + kind = "remote-tracking branch"; what = remote_name + 13; } else { |