[PATCH] Documentation: Introduce "upstream branch"
From: Santi Béjar <hidden>
Date: 2016-06-15 22:46:34
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Santi Béjar <redacted> --- Documentation/config.txt | 2 +- Documentation/glossary-content.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3afd124..f3ebd2f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -1215,7 +1215,7 @@ push.default:: * `matching` push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default. -* `tracking` push the current branch to the branch it is tracking. +* `tracking` push the current branch to its upstream branch. * `current` push the current branch to a branch of the same name. rebase.stat::
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 4fc1cf1..86be3ae 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt@@ -449,6 +449,12 @@ This commit is referred to as a "merge commit", or sometimes just a An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference. +[[def_upstream_branch]]upstream branch:: + The default <<def_branch,branch>> that is merged/rebased into another + branch. It is configured via branch.<name>.remote and + branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' it is + sometimes refered as "'A' is tracking 'origin/B'". + [[def_working_tree]]working tree:: The tree of actual checked out files. The working tree is normally equal to the <<def_HEAD,HEAD>> plus any local changes
--
1.6.1.258.g7ff14