"Sverre Hvammen Johansen" <hvammen@xxxxxxxxx> writes: > +FAST FORWARD STRATEGIES > +----------------------- I think this should be named FAST FORWARD OPTIONS or something like that. > + > +allow:: > + Do not generate a merge commit if the merge resolved > + as a fast-forward, only update the branch pointer. > + This is the default behavior of git-merge. This is equivalent of current '--ff'; perhaps this should be mentioned as well in this option description. > +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. > +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. > --no-ff:: > Generate a merge commit even if the merge resolved as a > - fast-forward. > + fast-forward. --on-ff is an alias for --ff=never. Typo: '--on-ff' instead of '--no-ff'. -- Jakub Narebski Poland ShadeHawk on #git -- 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
