From 0bfead36b23b884f8f3f3bb53c18963b7f2b5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 6 Jul 2014 16:11:27 +0200 Subject: [PATCH] branch: correct notion of remote-tracking branch and upstream The current documentation text seems to be very confused about what a remote-tracking branch is and what the relationship to an upstream is. Correct the text to talk about the upstream branch when dealing with the upstream configuration, instead of implying that it's related to the setup of remote-tracking branches. --- src/branch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/branch.c b/src/branch.c index 39ddd67..1793cea 100644 --- a/src/branch.c +++ b/src/branch.c @@ -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) @@ -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) @@ -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)