revert: add --ff option to allow fast forward when cherry-picking

diff --git a/builtin-log.c b/builtin-log.c
index 8d16832f7e9483f7903009459a72efc39e267c98..e0d5caa61bac72cb40272ab26aa9b2202d5bb3e8 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -1089,7 +1089,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 
        /*
         * We cannot move this anywhere earlier because we do want to
-        * know if --root was given explicitly from the comand line.
+        * know if --root was given explicitly from the command line.
         */
        rev.show_root_diff = 1;