Merge branch 'jc/fmt-patch' into next

* jc/fmt-patch:
rename internal format-patch wip

diff --combined git.c
index 447d86cd571bcc06b06c64a8713c7dd3c3e1a4f5,d5aa41df92d72f1fb1b9b92c55ee4fae069b332e..c20ae45bb77c840eec3cba4b90269930b0c96ccb
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -368,6 -368,8 +368,6 @@@ static int cmd_log(int argc, const cha
        init_revisions(&rev);
        rev.always_show_header = 1;
        rev.diffopt.recursive = 1;
 -      rev.combine_merges = 1;
 -      rev.ignore_merges = 0;
        return cmd_log_wc(argc, argv, envp, &rev);
  }
  
@@@ -383,7 -385,7 +383,7 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_wc },
                { "show", cmd_show },
-               { "format-patch", cmd_format_patch },
+               { "fmt-patch", cmd_format_patch },
        };
        int i;