"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Mikhail <mp39590@gmail.com>
Subject:
got: merge usage typo
To:
gameoftrees@openbsd.org
Date:
Mon, 23 Jan 2023 18:51:25 +0300

Download raw body.

Thread
$ got merge -f
      ^^^^^
got: unknown option -- f
usage: got rebase [-aclX] [branch]
           ^^^^^^

diff /home/misha/work/got
commit - b8aacf8e5c6c562d8245e7424ccceb7bf666b4ca
path + /home/misha/work/got
blob - cdcbeb71f9090dc6023894262edf4802c8cb907c
file + got/got.c
--- got/got.c
+++ got/got.c
@@ -12280,7 +12280,7 @@ cmd_merge(int argc, char *argv[])
 			interrupt_merge = 1;
 			break;
 		default:
-			usage_rebase();
+			usage_merge();
 			/* NOTREACHED */
 		}
 	}