From: Junio C Hamano <junkio@cox.net>
Date: Sun, 16 Apr 2006 02:35:55 +0000 (-0700)
Subject: Merge branch 'js/diffstat' into next
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=07512ea820b9161a1f45bb1bcc1bd67d6e1ea74f;p=git.git

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.
---

07512ea820b9161a1f45bb1bcc1bd67d6e1ea74f
diff --cc git.c
index c87accfa,140ed187..2e0ae5e5
--- a/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;