mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ms/remote-tracking-branches-in-doc'

Browse Source 
* ms/remote-tracking-branches-in-doc:
  Change "remote tracking" to "remote-tracking"
This commit is contained in:
Junio C Hamano
2013-07-12 12:04:07 -07:00
parent 5b307e95e8 d6ac1d2120
commit 778e4b8903
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -948,7 +948,7 @@ static int evaluate_result(void)
}
/*
* Pretend as if the user told us to merge with the tracking
* Pretend as if the user told us to merge with the remote-tracking
* branch we have for the upstream of the current branch
*/
static int setup_with_upstream(const char ***argv)
@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv)
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
for (i = 0; i < branch->merge_nr; i++) {
if (!branch->merge[i]->dst)
die(_("No remote tracking branch for %s from %s"),
die(_("No remote-tracking branch for %s from %s"),
branch->merge[i]->src, branch->remote_name);
args[i] = branch->merge[i]->dst;
}