From: Drew Northup Date: Mon, 18 Feb 2013 13:00:59 GMT Subject: Re: [PATCH v2 02/15] user-manual: Update for receive.denyCurrentBranch=refuse Message-ID: In-Reply-To: <7v4nhezpta.fsf@alter.siamese.dyndns.org> On Thu, Feb 14, 2013 at 1:57 PM, Junio C Hamano wrote: > I did not think the detailed discussion belongs there in the first > place, so I re-read the context. I think the only thing the reader > of the user manual needs to learn at that point of the flow is that > they can push to a non-bare but cannot push to update the currently > checked out branch by default. So let's tone everything down and do > this instead: > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index 85651b5..7c534dc 100644 > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1986,9 +1986,10 @@ handling this case. > > Note that the target of a "push" is normally a > <> repository. You can also push to a > -repository that has a checked-out working tree, but the working tree > -will not be updated by the push. This may lead to unexpected results if > -the branch you push to is the currently checked-out branch! > +repository that has a checked-out working tree, but a push to update the > +currently checked-out branch is denied by default to prevent confusion. > +See the description ofthe receive.denyCurrentBranch option > +in linkgit:git-config[1] for details. This looks safe to me, with the minor nit that "ofthe" ("of the") isn't one word. -- -Drew Northup -------------------------------------------------------------- "As opposed to vegetable or mineral error?" -John Pescatore, SANS NewsBites Vol. 12 Num. 59