{"thread":{"id":"18758","subject":"[PATCH] Documentation: Introduce \"upstream branch\"","startedAt":"2009-04-06T23:24:30Z","lastAt":"2009-04-06T23:24:30Z","messageCount":1,"participants":["Santi Béjar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"110640","messageId":"1239060270-15307-1-git-send-email-santi@agolina.net","threadId":"18758","inReplyTo":null,"subject":"[PATCH] Documentation: Introduce \"upstream branch\"","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2009-04-06T23:24:30Z","receivedAt":"2009-04-06T23:24:30Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\nSigned-off-by: Santi Béjar <santi@agolina.net>\n---\n Documentation/config.txt           |    2 +-\n Documentation/glossary-content.txt |    6 ++++++\n 2 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 3afd124..f3ebd2f 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1215,7 +1215,7 @@ push.default::\n * `matching` push all matching branches.\n   All branches having the same name in both ends are considered to be\n   matching. This is the default.\n-* `tracking` push the current branch to the branch it is tracking.\n+* `tracking` push the current branch to its upstream branch.\n * `current` push the current branch to a branch of the same name.\n \n rebase.stat::\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 4fc1cf1..86be3ae 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -449,6 +449,12 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tAn <<def_object,object>> which is not <<def_reachable,reachable>> from a\n \t<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.\n \n+[[def_upstream_branch]]upstream branch::\n+\tThe default <<def_branch,branch>> that is merged/rebased into another\n+\tbranch. It is configured via branch.<name>.remote and\n+\tbranch.<name>.merge. If the upstream branch of 'A' is 'origin/B' it is\n+\tsometimes refered as \"'A' is tracking 'origin/B'\".\n+\n [[def_working_tree]]working tree::\n \tThe tree of actual checked out files.  The working tree is\n \tnormally equal to the <<def_HEAD,HEAD>> plus any local changes\n-- \n1.6.1.258.g7ff14\n"}]}