commit - 648e4ef7f69d8e5852f9d53021c8863df78fed33
commit + 016477fd0e28904c48c579801cd75d6314a848c4
blob - 78be0b25778ab9aadac8e514150e357eb2bb13ee
blob + 892d74adc7e2c036bf693521b13f8399543ee673
--- got/got.1
+++ got/got.1
.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
blob - 85ea7257fdc18a8c40ef5ed062fc16e6509d06d5
blob + 9ab824b4938b0e7ee27eb4d390a76c74e7f61c9f
--- got/got.c
+++ got/got.c
{ "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" },
};