From: Junio C Hamano <junkio@cox.net>
Date: Sun, 16 Apr 2006 09:31:11 +0000 (-0700)
Subject: Merge branch 'master' into lt/logopt
X-Git-Tag: v1.4.0-rc1~239^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2934926dd7455de61577c1dfdf4c12d224e7ae0;p=git.git

Merge branch 'master' into lt/logopt

* master:
  pager: do not fork a pager if PAGER is set to empty.
  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-tree: typefix.
  GIT v1.3.0-rc4
  xdiff: post-process hunks to make them consistent.
---

b2934926dd7455de61577c1dfdf4c12d224e7ae0
diff --cc git.c
index 9e29ade2b,140ed1873..a6cfd1d8a
--- a/git.c
+++ b/git.c
@@@ -327,11 -385,13 +327,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(rev->commit_format, commit, ~0, buf,
 +				    LOGSIZE, rev->abbrev);
  		printf("%s\n", buf);
- 		if (rev->diff)
 -		if (do_diff) {
++		if (rev->diff) {
+ 			printf("---\n");
 -			log_tree_commit(&opt, commit);
 +			log_tree_commit(rev, commit);
+ 		}
  		shown = 1;
  		free(commit->buffer);
  		commit->buffer = NULL;