Merge branch 'js/diffstat' into next

* js/diffstat:
  diff-options: add --patch-with-stat
  diff-files --stat: do not dump core with unmerged index.
  Support "git cmd --help" syntax
  diff --stat: do not do its own three-dashes.

diff --cc git.c
index c87accfa1af6368801975718a19f3fef47568d03,140ed1873d7b5e334452cc8f8ac75a0541e32b6c..2e0ae5e58ebd2f4ae58d934d9098b9de85c31ab1
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -330,11 -385,13 +330,13 @@@ static int cmd_log_wc(int argc, const c
                        putchar(' ');
                else
                        putchar('\n');
 -              pretty_print_commit(commit_format, commit, ~0, buf,
 -                                  LOGSIZE, abbrev);
 +              pretty_print_commit(opt->commit_format, commit, ~0, buf,
 +                                  LOGSIZE, wcopt->abbrev);
                printf("%s\n", buf);
-               if (wcopt->do_diff)
 -              if (do_diff) {
++              if (wcopt->do_diff) {
+                       printf("---\n");
 -                      log_tree_commit(&opt, commit);
 +                      log_tree_commit(opt, commit);
+               }
                shown = 1;
                free(commit->buffer);
                commit->buffer = NULL;