git-rebase.txt: --interactive does not work with --whitespace

diff --git a/builtin-merge.c b/builtin-merge.c
index e4555b01996050db8d2909bc6e6bf5110b2bf4c9..885fad9bba1310e6ed8424f9d4b481e066760a9b 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -36,8 +36,8 @@ struct strategy {
 };
 
 static const char * const builtin_merge_usage[] = {
-       "git-merge [options] <remote>...",
-       "git-merge [options] <msg> HEAD <remote>",
+       "git merge [options] <remote>...",
+       "git merge [options] <msg> HEAD <remote>",
        NULL
 };