merge: match the help text with the documentation
We used to be very casual in terminology and used <branch>, <ref> and <rev> more or less interchangeably with <commit>. Match the help text given by "git merge -h" with that of the documentation. Signed-off-by: Jared Hance <jaredhance@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jared Hance committed
Feb 10, 2011 at 18:52 UTC
c395c25b8642893dd1bb4be1fd124dd12f9b848c
1 file changed
+3
-2
builtin/merge.c
+3
-2
@@ -37,8 +37,9 @@ struct strategy {
37
};
38
39
static const char * const builtin_merge_usage[] = {
40
- "git merge [options] <remote>...",
41
- "git merge [options] <msg> HEAD <remote>",
40
+ "git merge [options] <commit>...",
41
+ "git merge [options] <msg> HEAD <commit>",
42
+ "git merge --abort",
43
NULL
44
};
45