diff options
| author | Jared Hance <jaredhance@gmail.com> | 2011-02-10 23:52:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-24 07:09:51 (GMT) |
| commit | c395c25b8642893dd1bb4be1fd124dd12f9b848c (patch) | |
| tree | 5dcc2fc657a4d46e694aef9d75807906a5e804cd /builtin | |
| parent | 7811d9600f02e70c9f835719c71156c967a684f7 (diff) | |
| download | git-c395c25b8642893dd1bb4be1fd124dd12f9b848c.zip git-c395c25b8642893dd1bb4be1fd124dd12f9b848c.tar.gz git-c395c25b8642893dd1bb4be1fd124dd12f9b848c.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 42fff38..a2105ef 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -37,8 +37,9 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - "git merge [options] <remote>...", - "git merge [options] <msg> HEAD <remote>", + "git merge [options] <commit>...", + "git merge [options] <msg> HEAD <commit>", + "git merge --abort", NULL }; |