From: Junio C Hamano <gitster@pobox.com>
To: Finn Arne Gangstad <finnag@pvv.org>
Cc: git@vger.kernel.org, "Santi Béjar" <santi@agolina.net>
Subject: Re: [PATCH] Documentation: push.default applies to all remotes
Date: Mon, 23 Mar 2009 16:32:28 -0700 [thread overview]
Message-ID: <7v7i2f6cj7.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1237850318-3671-1-git-send-email-santi@agolina.net> (Santi Béjar's message of "Tue, 24 Mar 2009 00:18:38 +0100")
Santi Béjar <santi@agolina.net> writes:
> push.default is not only for the current remote but setting the default
> behavior for all remotes.
>
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
> Hi,
>
> this applies on top of next.
>
> Documentation/config.txt | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 089569a..7f5fe43 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1215,19 +1215,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.
> * `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
This makes sense; I can understand why "same name" wanted to be qualified
with "on the current remote", but the sentence reads just fine without it.
It is clear that the "same name" compares the set of branches the local
repository has with the set of branches in the other repository we are
pushing into.
If we want to explain that a "git push" that does not say where-to decides
where to push by looking at branch.<name>.remote configuration and falling
back to origin, push.default is not the place to explain it. This
configuration variable is not involved in that decision in any way.
The description for branch.<name>.remote can be updated to say it is used
for both fetch and push.
next prev parent reply other threads:[~2009-03-23 23:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 23:18 [PATCH] Documentation: push.default applies to all remotes Santi Béjar
2009-03-23 23:32 ` Junio C Hamano [this message]
2009-03-24 8:30 ` Finn Arne Gangstad
2009-03-24 9:39 ` Santi Béjar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v7i2f6cj7.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).