On 10/29/07, Lars Hjemli <hjemli@xxxxxxxxx> wrote: > On 10/28/07, Yin Ping <pkufranky@xxxxxxxxx> wrote: > > Released git version 1.5.3.4 > > --ff/--no-ff is not part of any released git version; you'll need to > build the 'master' branch of git.git. And they're currently only > supported by git-merge, not git-pull (the same goes for --no-squash). see, 3x -- franky - 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
