X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.c;h=140ed1873d7b5e334452cc8f8ac75a0541e32b6c;hb=402461aab17292b78bd36a17bff18e48d544cc9a;hp=78ed403ed121a84c3efe3a57fa7c24486d724953;hpb=f43ba60e2c3bec4925eee229fa0f420dd1296f0c;p=git.git

diff --git a/git.c b/git.c
index 78ed403e..140ed187 100644
--- a/git.c
+++ b/git.c
@@ -388,8 +388,10 @@ static int cmd_log(int argc, const char **argv, char **envp)
 		pretty_print_commit(commit_format, commit, ~0, buf,
 				    LOGSIZE, abbrev);
 		printf("%s\n", buf);
-		if (do_diff)
+		if (do_diff) {
+			printf("---\n");
 			log_tree_commit(&opt, commit);
+		}
 		shown = 1;
 		free(commit->buffer);
 		commit->buffer = NULL;
@@ -411,6 +413,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))