ff1
ff2
Merge pull request #1 from zwhfly/master

"--no-ff"?
zwhfly def