From: Junio C Hamano Date: Sun, 24 Feb 2013 08:13:25 GMT Subject: Re: [PATCH v2] Documentation/githooks: Explain pre-rebase parameters Message-ID: <7v621i6sey.fsf@alter.siamese.dyndns.org> In-Reply-To: <20130223213513.GF1361@odin.tremily.us> "W. Trevor King" writes: > On Sat, Feb 23, 2013 at 01:21:59PM -0800, Junio C Hamano wrote: >> "W. Trevor King" writes: >> >> > +This hook is called by 'git rebase' and can be used to prevent a >> > +branch from getting rebased. The hook takes two parameters: the >> > +upstream the series was forked from and the branch being rebased. The >> > +second parameter will be missing when rebasing the current branch. >> >> takes one or two parameters? >> >> Other than that, looks good to me, but it took me two readings to >> notice where these two parameters are described. I have a feeling >> that a comma s/forked from and/forked from, and/; might make them a >> bit more spottable, but others may have better suggestions to make >> them stand out more. > > How about: > > The hook may be called with one or two parameters. The first > parameter is the upstream from which the series was forked. The > second parameter is the branch being rebased, and is not set when > rebasing the current branch. Much nicer. Thanks.