On Tue, Mar 11, 2008 at 1:15 AM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > > +never:: > > + Generate a merge commit even if the merge resolved > > + as a fast-forward. > > This is equivalent of current '--no-ff'; nevertheless I think that it > would be better to name this strategy 'commit' or 'merge', as in > --ff=merge, or --ff=commit. If there is consensus to change this I will. > > +only:: > > + Only allow a fast-forward. The merge will fail > > + unless HEAD is up to date or the merge resolved as > > + a fast-forward. > > This is equivalent of '--ff-only' or '--strategy=ff'... Errr... > I'm sorry, such option does not exist, and it would be I guess > useful addition to default non '+' fetch refspec allowing fast-forward > only, and to receive.denyNonFastForwards to control push behavior. I agree, but it is over my head to implement this now. -- Sverre Hvammen Johansen -- 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
