mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity

merge: match the help text with the documentation

Browse source 
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>
This commit is contained in:
Jared Hance 2011-02-10 18:52:41 -05:00 committed by Junio C Hamano
parent 7811d9600f
commit c395c25b86
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin/merge.c
View file

@ -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
};