From: Philip Oakley Date: Mon, 23 Apr 2012 19:00:25 GMT Subject: Re: [PATCH 1/7] Documentation: explain push.default option a bit more Message-ID: In-Reply-To: <1335170284-30768-2-git-send-email-Matthieu.Moy@imag.fr> From: "Matthieu Moy" Sent: Monday, April 23, 2012 9:37 AM > The previous documentation was explaining _what_ the options were doing, > but were of little help explaining _why_ a user should set his default to > either of the options. > > Signed-off-by: Matthieu Moy > --- > Documentation/config.txt | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index fb386ab..e38fab1 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1680,12 +1680,26 @@ push.default:: > line. Possible values are: > + > * `nothing` - do not push anything. > -* `matching` - push all matching branches. > - All branches having the same name in both ends are considered to be > - matching. This is the default. > -* `upstream` - push the current branch to its upstream branch. > +* `matching` - push all branches having the same name in both ends. > + This allows those who prepare all the branches into a publishable > + shape to push them out to a non-shared repository with a single > + command. This is well suited when pushing to a non-shared > + repository, but may give surprising results when used on a > + repository shared by multiple users, since locally stalled > + branches will attempt a non-fast forward push if other users > + updated the branch remotely. This is the default. Given the expected future change to 'simple' as the default, surely "This is currently the default." give the hint toward that change. > +* `upstream` - push the current branch to its upstream branch. See > + "branch..merge" for how to configure the upstream branch. This > + makes `git push` and `git pull` symmetrical in the sense that `push` > + will update the same remote ref as the one which is merged by > + `git pull`. > * `tracking` - deprecated synonym for `upstream`. > * `current` - push the current branch to a branch of the same name. > + + > + The `current` and `upstream` modes are for those who want to > + push out a single branch after finishing work, even when the other > + branches are not yet ready to be pushed out. They are safe when > + pushing to a shared repository. > > rebase.stat:: > Whether to show a diffstat of what changed upstream since the last > -- > 1.7.10.234.ge65dd.dirty > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > ----- > No virus found in this message. > Checked by AVG - www.avg.com > Version: 2012.0.1913 / Virus Database: 2411/4953 - Release Date: 04/22/12 >