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.

diff --cc git.c
index 9e29ade2b4b7b92d6eb6a4ffad56db37642a3620,140ed1873d7b5e334452cc8f8ac75a0541e32b6c..a6cfd1d8aaf13bf391c69c7f91b14fd68e0d36e9
--- 1/git.c
--- 2/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;