Skip to content

branch: correct notion of remote-tracking branch and upstream #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2014
Merged

branch: correct notion of remote-tracking branch and upstream #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/branch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Branch_branch_name__get__(Branch *self)


PyDoc_STRVAR(Branch_remote_name__doc__,
"The name of the remote that the remote tracking branch belongs to.");
"The name of the remote set to be the upstream of this branch.");

PyObject *
Branch_remote_name__get__(Branch *self)
Expand All @@ -154,8 +154,8 @@ Branch_remote_name__get__(Branch *self)


PyDoc_STRVAR(Branch_upstream__doc__,
"The branch supporting the remote tracking branch or None if this is not a "
"remote tracking branch. Set to None to unset.");
"The branch's upstream branch or None if this branch does not have an upstream set. "
"Set to None to unset the upstream configuration.");

PyObject *
Branch_upstream__get__(Branch *self)
Expand Down Expand Up @@ -206,7 +206,7 @@ int Branch_upstream__set__(Branch *self, Reference *py_ref)


PyDoc_STRVAR(Branch_upstream_name__doc__,
"The name of the reference supporting the remote tracking branch.");
"The name of the reference set to be the upstream of this one");

PyObject *
Branch_upstream_name__get__(Branch *self)
Expand Down