From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 11/10] doc: push.default is no longer "matching"
Date: Tue, 08 Jan 2013 14:28:32 -0800 [thread overview]
Message-ID: <7v1udvcnsf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1357368788-28035-1-git-send-email-gitster@pobox.com> (Junio C. Hamano's message of "Fri, 4 Jan 2013 22:52:58 -0800")
The documentation for the command said that `push.default` is the
default without referring to the releavant manual page.
Now `simple` is the default behaviour. Document it right there where
we say we take the default value from `push.default`, and remove the
description of old default being 'matching'.
Also reword cryptic desription of `--all`.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I skimmed our two tutorials, just to be sure, but they do not
discuss 'git push', so there was nothing to update there.
I *think* we are minimally ready to switch the default behaviour
now, but there may be other places that need similar adjustment.
An independent audit is highly appreciated.
Documentation/git-push.txt | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 8b637d3..f326afb 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -36,10 +36,14 @@ OPTIONS[[OPTIONS]]
The format of a <refspec> parameter is an optional plus
`+`, followed by the source ref <src>, followed
by a colon `:`, followed by the destination ref <dst>.
- It is used to specify with what <src> object the <dst> ref
- in the remote repository is to be updated. If not specified,
+ It is used to specify what <src> object the <dst> ref
+ in the remote repository is to be updated to. If no
+ <refspec> is specified on the command line, and if no
+ <refspec> is configured for the <repository>,
the behavior of the command is controlled by the `push.default`
- configuration variable.
+ configuration variable, and if it is unset, the `simple`
+ behaviour is used (see lingit:git-config[1] and look
+ for `push.default`).
+
The <src> is often the name of the branch you would want to push, but
it can be any arbitrary "SHA-1 expression", such as `master~4` or
@@ -65,14 +69,11 @@ the remote repository.
The special refspec `:` (or `+:` to allow non-fast-forward updates)
directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name
-already exists on the remote side. This is the default operation mode
-if no explicit refspec is found (that is neither on the command line
-nor in any Push line of the corresponding remotes file---see below) and
-no `push.default` configuration variable is set.
+already exists on the remote side.
--all::
- Instead of naming each ref to push, specifies that all
- refs under `refs/heads/` be pushed.
+ Push all branches (i.e. refs under `refs/heads/`); cannot be
+ used with other <refspec>.
--prune::
Remove remote branches that don't have a local counterpart. For example
--
1.8.1.317.ga1ba510
prev parent reply other threads:[~2013-01-08 22:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 6:52 [PATCH 00/10] push: switch default from "matching" to "simple" Junio C Hamano
2013-01-05 6:52 ` [PATCH 01/10] t5404: do not assume the "matching" push is the default Junio C Hamano
2013-01-05 6:53 ` [PATCH 02/10] t5505: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 03/10] t5516: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 04/10] t5517: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 05/10] t5519: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 06/10] t5531: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 07/10] t7406: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 08/10] t9400: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 09/10] t9401: " Junio C Hamano
2013-01-05 6:53 ` [PATCH 10/10] push: switch default from "matching" to "simple" Junio C Hamano
2013-01-05 19:39 ` [PATCH 00/10] " Matthieu Moy
2013-01-08 22:28 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1udvcnsf.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).