Move the --no-ff notice to the wiki