X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.c;h=5209b04de50b23c2410573dae285e156ed25f833;hb=61c2bcbd11e3b66a328b3850c01592e5dc1c67bb;hp=61265a85661a3b56c6ad437099ab0c85e9fbe158;hpb=6f4780f9dfd3bc6b23f9ea66b3d49577e0a0c2f9;p=git.git

diff --git a/git.c b/git.c
index 61265a85..5209b04d 100644
--- a/git.c
+++ b/git.c
@@ -344,8 +344,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
 			opt.ignore_merges = 0;
 		if (opt.dense_combined_merges)
 			opt.diffopt.output_format = DIFF_FORMAT_PATCH;
-		if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
-			opt.diffopt.recursive = 1;
 		if (!full_diff && rev.prune_data)
 			diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
 		diff_setup_done(&opt.diffopt);
@@ -413,6 +411,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))