Documentation: Introduce "upstream branch"
Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Santi Béjar committed
Apr 7, 2009 at 01:24 UTC
e892dc713e6b0881320d4c65bff7a49d44752bda
2 files changed
+7
-1
Documentation/config.txt
+1
-1
@@ -1208,7 +1208,7 @@ push.default::
1208
* `matching` push all matching branches.
1209
All branches having the same name in both ends are considered to be
1210
matching. This is the default.
1211
-* `tracking` push the current branch to the branch it is tracking.
1211
+* `tracking` push the current branch to its upstream branch.
1212
* `current` push the current branch to a branch of the same name.
1213
1214
rebase.stat::
Documentation/glossary-content.txt
+6
@@ -449,6 +449,12 @@ This commit is referred to as a "merge commit", or sometimes just a
449
An <<def_object,object>> which is not <<def_reachable,reachable>> from a
450
<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.
451
452
+[[def_upstream_branch]]upstream branch::
453
+ The default <<def_branch,branch>> that is merged into the branch in
454
+ question (or the branch in question is rebased onto). It is configured
455
+ via branch.<name>.remote and branch.<name>.merge. If the upstream branch
456
+ of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'".
457
+
458
[[def_working_tree]]working tree::
459
The tree of actual checked out files. The working tree is
460
normally equal to the <<def_HEAD,HEAD>> plus any local changes