On Jan 16, 2008 12:31 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > A sane integration is a different story. > > We have --ff and --no-ff options to merge. How should this new > option --ff-only mesh with them? Perhaps we would want to have > an option --ff that takes three values? > > --ff=never > --ff=normal > --ff=only > > and have the first one be synonym for existing --no-ff, the second > one to be a synonym for not giving anything (or giving --ff > explicitly), and the third one to be this new mode of operation? Thanks for the patch. I can probably look into it tonight and do the suggested integration and test it out, I keep you posted. -- 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
