Merge branch 'ms/reflog-show-is-default'

gitster · gitster · commit 68590435c147 · 2011-08-08T12:33:35.000-07:00
* ms/reflog-show-is-default:
  reflog: actually default to subcommand 'show'
diff --git a/builtin/reflog.c b/builtin/reflog.c
@@ -777,6 +777,5 @@ int cmd_reflog(int argc, const char **argv, const char *prefix)
 	if (!strcmp(argv[1], "delete"))
 		return cmd_reflog_delete(argc - 1, argv + 1, prefix);
 
-	/* Not a recognized reflog command..*/
-	usage(reflog_usage);
+	return cmd_log_reflog(argc, argv, prefix);
 }

Original file line number	Diff line number	Diff line change
`@@ -777,6 +777,5 @@ int cmd_reflog(int argc, const char *argv, const char prefix)`
`777`	`777`	`if (!strcmp(argv[1], "delete"))`
`778`	`778`	`return cmd_reflog_delete(argc - 1, argv + 1, prefix);`
`779`	`779`
`780`		`- /* Not a recognized reflog command..*/`
`781`		`- usage(reflog_usage);`
	`780`	`+ return cmd_log_reflog(argc, argv, prefix);`
`782`	`781`	`}`