Merge branch 'maint'

* maint:
clone: detect and fail on excess parameters
Remove 'header' from --signoff option description

diff --combined builtin-commit.c
index b41d4a3561d6fd4376c1520c3b7dd436674e8325,52a05c20bbf4d6d70ac293e3960ead33454357fa..256181a68bd991278fda4ecb48911d03b5f23141
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -90,7 -90,7 +90,7 @@@ static struct option builtin_commit_opt
        OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
        OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
        OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
-       OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"),
+       OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
        OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"),
        OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
  
@@@ -745,8 -745,10 +745,8 @@@ static int parse_and_validate_options(i
                die("No paths with --include/--only does not make sense.");
        if (argc == 0 && only && amend)
                only_include_assumed = "Clever... amending the last one with dirty index.";
 -      if (argc > 0 && !also && !only) {
 +      if (argc > 0 && !also && !only)
                only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
 -              also = 0;
 -      }
        if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
                cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
        else if (!strcmp(cleanup_arg, "verbatim"))
@@@ -808,7 -810,7 +808,7 @@@ static void print_summary(const char *p
  
        rev.verbose_header = 1;
        rev.show_root_diff = 1;
 -      rev.commit_format = get_commit_format("format:%h: %s");
 +      get_commit_format("format:%h: %s", &rev);
        rev.always_show_header = 0;
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = 100;