Hi Paul, On 2015-05-13 11:52, Paul Tan wrote: > Since b814da8 (pull: add pull.ff configuration, 2014-01-15), running > git-pull with the configuration pull.ff=false or pull.ff=only is > equivalent to passing --no-ff and --ff-only to git-merge. However, if > pull.ff=true, no switch is passed to git-merge. This leads to the > confusing behavior where pull.ff=false or pull.ff=only is able to > override merge.ff, while pull.ff=true is unable to. > > This patch series adds a failing test to demonstrates the above, and fixes it. > > The documentation is also tweaked to clarify that pull.ff is meant to override > merge.ff. > > The last patch makes pull.ff consistent with merge.ff by supporting the config > aliases of true and false (on, off, 0, 1). Looks very good! Reviewed-by: Johannes Schindelin <johannes.schindelin@xxxxxx> Ciao, Dscho -- 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