thodg/got

diff --git a/got/got.1 b/got/got.1
index 78be0b2..892d74a 100644
--- a/got/got.1
+++ b/got/got.1
@@ -483,7 +483,7 @@ to a single base commit with
 .Cm got update .
 If the work tree already contains files with merge conflicts, these
 conflicts must be resolved first.
-.It Cm ch
+.It Cm cy
 Short alias for
 .Cm cherrypick .
 .It Cm backout Ar commit
diff --git a/got/got.c b/got/got.c
index 85ea725..9ab824b 100644
--- a/got/got.c
+++ b/got/got.c
@@ -123,7 +123,7 @@ static struct got_cmd got_commands[] = {
 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
-	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "ch" },
+	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
 };