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.

1 files changed, 9 insertions, 1 deletions

diff --git a/git.c b/git.c
index 9e29ade2b4..a6cfd1d8aa 100644
--- a/git.c
+++ b/git.c
@@ -330,8 +330,10 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
 		pretty_print_commit(rev->commit_format, commit, ~0, buf,
 				    LOGSIZE, rev->abbrev);
 		printf("%s\n", buf);
-		if (rev->diff)
+		if (rev->diff) {
+			printf("---\n");
 			log_tree_commit(rev, commit);
+		}
 		shown = 1;
 		free(commit->buffer);
 		commit->buffer = NULL;
@@ -398,6 +400,12 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 	};
 	int i;
 
+	/* Turn "git cmd --help" into "git help cmd" */
+	if (argc > 1 && !strcmp(argv[1], "--help")) {
+		argv[1] = argv[0];
+		argv[0] = cmd = "help";
+	}
+
 	for (i = 0; i < ARRAY_SIZE(commands); i++) {
 		struct cmd_struct *p = commands+i;
 		if (strcmp(p->cmd, cmd))