Thanks Junio! Note that I think the word is usually spelled "controlled" not "controled". On Tue, Oct 2, 2012 at 11:34 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > >> David Glasser wrote: >>> Thanks Rankumar! There's also the reference in the "git push origin" >>> example and the "This is the default operation mode if no explicit >>> refspec is found". >> >> Sorry; here's a revised patch. >> >> --8<-- > > FYI: the above is not a scissors line. > >> From: Ramkumar Ramachandra <artagnon@xxxxxxxxx> >> Date: Tue, 2 Oct 2012 21:06:05 +0530 >> Subject: [PATCH] Documentation: mention `push.default` in git-push.txt >> >> Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> >> --- >> Documentation/git-push.txt | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt >> index cb97cc1..e1e9aca 100644 >> --- a/Documentation/git-push.txt >> +++ b/Documentation/git-push.txt >> @@ -37,7 +37,8 @@ OPTIONS[[OPTIONS]] >> `+`, 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. >> + in the remote repository is to be updated. If not specified, >> + the configuration variable `push.default` is used. > > I think this is way suboptimal; it is begging users to do this > > [push] > default = frotz:xyzzy > > by making it sound as if push.default gives a default for <refs>. > >> @@ -65,7 +66,8 @@ directs git to push "matching" branches: for every >> branch that >> 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). >> +nor in any Push line of the corresponding remotes file, or `push.default` >> +---see below). > > Likewise. The added part should not be inside the parentheses, > which is about what the value used for refspec. `push.default` is > about what happens when there is _no_ refspec. > > I'll queue this instead. Thanks. > > -- >8 -- > From: Ramkumar Ramachandra <artagnon@xxxxxxxxx> > Date: Tue, 2 Oct 2012 21:08:00 +0530 > Subject: [PATCH] Documentation: mention `push.default` in git-push.txt > > It already is listed in the "git config" documentation, but people > interested in pushing would first look at "git push" documentation. > > Noticed-by: David Glasser > Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> > Acked-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> > Fixed-by: Junio C Hamano <gitster@xxxxxxxxx> > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > Documentation/git-push.txt | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt > index cb97cc1..70b18bc 100644 > --- a/Documentation/git-push.txt > +++ b/Documentation/git-push.txt > @@ -37,7 +37,9 @@ OPTIONS[[OPTIONS]] > `+`, 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. > + in the remote repository is to be updated. If not specified, > + the behavior of the command is controled by the `push.default` > + configuration variable. > + > 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,7 +67,8 @@ 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). > +nor in any Push line of the corresponding remotes file---see below) and > +no `push.default` configuration variable is set. > > --all:: > Instead of naming each ref to push, specifies that all > @@ -357,7 +360,8 @@ Examples > `git push origin :`. > + > The default behavior of this command when no <refspec> is given can be > -configured by setting the `push` option of the remote. > +configured by setting the `push` option of the remote, or the `push.default` > +configuration variable. > + > For example, to default to pushing only the current branch to `origin` > use `git config remote.origin.push HEAD`. Any valid <refspec> (like > -- > 1.8.0.rc0.45.g7ce8dc5 > -- glasser@xxxxxxxxxxxxxxxx | langtonlabs.org | flickr.com/photos/glasser/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html