summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Santi Béjar <santi@agolina.net>2009-04-07 01:24:30 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-07 22:04:41 -0700
commite892dc713e6b0881320d4c65bff7a49d44752bda (patch)
tree82318fab0925c0a72f4f0c5bb11e52366abbefda /Documentation/config.txt
parentDocumentation: push.default applies to all remotes (diff)
downloadtgif-e892dc713e6b0881320d4c65bff7a49d44752bda.tar.xz
Documentation: Introduce "upstream branch"
Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ad22cb875e..77d3a8e31c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1208,7 +1208,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::