summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Santi Béjar <santi@agolina.net>2009-03-30 12:11:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 09:20:41 -0700
commit01eadafccbeae485503f5373dc60cc5a04877c3b (patch)
tree9e7bf5c86b87f372f9b6cb782e0f582ebba2b48e /Documentation/config.txt
parentDocumentation: enhance branch.<name>.{remote,merge} (diff)
downloadtgif-01eadafccbeae485503f5373dc60cc5a04877c3b.tar.xz
Documentation: push.default applies to all remotes
push.default is not only for the current remote but setting the default behaviour for all remotes. 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.txt13
1 files changed, 4 insertions, 9 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6fc8da0bf..ad22cb875e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1202,19 +1202,14 @@ push.default::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
- line.
-+
-The term `current remote` means the remote configured for the current
-branch, or `origin` if no remote is configured. `origin` is also used
-if you are not on any branch. Possible values are:
+ line. Possible values are:
+
* `nothing` do not push anything.
-* `matching` push all matching branches to the current remote.
+* `matching` push all matching branches.
All branches having the same name in both ends are considered to be
- matching. This is the current default value.
+ matching. This is the default.
* `tracking` push the current branch to the branch it is tracking.
-* `current` push the current branch to a branch of the same name on the
- current remote.
+* `current` push the current branch to a branch of the same name.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last