kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
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[] = { static const char * const builtin_merge_usage[] = {
"git merge [options] <remote>...", "git merge [options] <commit>...",
"git merge [options] <msg> HEAD <remote>", "git merge [options] <msg> HEAD <commit>",
"git merge --abort",
NULL NULL
}; };