Hi Geoffrey, > I am of the opinion that major feature branches should be rebased > *and* that they should then be merged with --no-ff. I totally agree with you. :-) --Kazu