summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:25 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:20:47 -0700
commit13931236b9ee2895a98ffdbdacbd0f895956d8a8 (patch)
tree88613be74b32ddbc8c42f4b0eec10d616ff846e2 /branch.h
parent29b9a66f285f602ad67362ccbe2c6bfaac769f54 (diff)
downloadgit-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.gz
Change incorrect "remote branch" to "remote tracking branch" in C code
(Just like we did for documentation already) In the process, we change "non-remote branch" to "branch outside the refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch". The new formulation actually corresponds to how the code detects this case (i.e. prefixcmp(refname, "refs/remotes")). Also, we use 'remote-tracking branch' in generated merge messages (by merge an fmt-merge-msg). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.h')
-rw-r--r--branch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/branch.h b/branch.h
index eed817a64c..4026e3832b 100644
--- a/branch.h
+++ b/branch.h
@@ -22,8 +22,8 @@ void create_branch(const char *head, const char *name, const char *start_name,
void remove_branch_state(void);
/*
- * Configure local branch "local" to merge remote branch "remote"
- * taken from origin "origin".
+ * Configure local branch "local" as downstream to branch "remote"
+ * from remote "origin". Used by git branch --set-upstream.
*/
#define BRANCH_CONFIG_VERBOSE 01
extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);