New alias: nfm (merge --no-ff)