Re: Merging using only fast-forward

merlyn@stonehenge.com (Randal L. Schwartz) writes:

Junio implemented a 7-line patch on the IRC channel (calling parts of it
"for randal" or something, I believe :) to do precisely this.

Perhaps you can test it, and submit it as if it were your idea.  I, for one,
would use it as well.  I'm doing ugly things with parsing the output of
git-status right now to achieve the same thing.

The mechanism itself is simple.  

	http://git.pastebin.com/m156a1856

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?