mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
Merge branch 'sb/doc-upstream-branch'
* sb/doc-upstream-branch: Documentation: Introduce "upstream branch"
This commit is contained in:
commit
c736becc94
2 changed files with 7 additions and 1 deletions
|
@ -1215,7 +1215,7 @@ push.default::
|
||||||
* `matching` push all matching branches.
|
* `matching` push all matching branches.
|
||||||
All branches having the same name in both ends are considered to be
|
All branches having the same name in both ends are considered to be
|
||||||
matching. This is the default.
|
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.
|
* `current` push the current branch to a branch of the same name.
|
||||||
|
|
||||||
rebase.stat::
|
rebase.stat::
|
||||||
|
|
|
@ -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
|
An <<def_object,object>> which is not <<def_reachable,reachable>> from a
|
||||||
<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.
|
<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.
|
||||||
|
|
||||||
|
[[def_upstream_branch]]upstream branch::
|
||||||
|
The default <<def_branch,branch>> that is merged into the branch in
|
||||||
|
question (or the branch in question is rebased onto). It is configured
|
||||||
|
via branch.<name>.remote and branch.<name>.merge. If the upstream branch
|
||||||
|
of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'".
|
||||||
|
|
||||||
[[def_working_tree]]working tree::
|
[[def_working_tree]]working tree::
|
||||||
The tree of actual checked out files. The working tree is
|
The tree of actual checked out files. The working tree is
|
||||||
normally equal to the <<def_HEAD,HEAD>> plus any local changes
|
normally equal to the <<def_HEAD,HEAD>> plus any local changes
|
||||||
|
|
Loading…
Reference in a new issue