summaryrefslogtreecommitdiff
path: root/include/git2/branch.h
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2013-03-30 03:39:19 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2013-03-30 15:45:57 +0100
commita258d8e3574c4e993bf16e0c136d1a5fbc356728 (patch)
tree25f4fc5e103024fc592cfb568691f24a86d356b5 /include/git2/branch.h
parent81b8c9df4642328a7d0dc0920f1489748371d275 (diff)
downloadlibgit2-a258d8e3574c4e993bf16e0c136d1a5fbc356728.tar.gz
branch: rename 'tracking' to 'upstream'
The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.
Diffstat (limited to 'include/git2/branch.h')
-rw-r--r--include/git2/branch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/branch.h b/include/git2/branch.h
index 4d24e2d82..28bb1f5f0 100644
--- a/include/git2/branch.h
+++ b/include/git2/branch.h
@@ -173,7 +173,7 @@ GIT_EXTERN(int) git_branch_name(const char **out,
* @return 0 on success; GIT_ENOTFOUND when no remote tracking
* reference exists, otherwise an error code.
*/
-GIT_EXTERN(int) git_branch_tracking(
+GIT_EXTERN(int) git_branch_upstream(
git_reference **out,
git_reference *branch);
@@ -195,7 +195,7 @@ GIT_EXTERN(int) git_branch_tracking(
* including the trailing NUL byte; GIT_ENOTFOUND when no remote tracking
* reference exists, otherwise an error code.
*/
-GIT_EXTERN(int) git_branch_tracking_name(
+GIT_EXTERN(int) git_branch_upstream_name(
char *tracking_branch_name_out,
size_t buffer_size,
git_repository *repo,