From: Stefan Sperling <stsp@stsp.name>
Subject: Re: got.1: Mark the commit argument to cherrypick and backout optional
To: gameoftrees@openbsd.org
Date: Sat, 28 Jan 2023 20:46:11 +0100

On Sat, Jan 28, 2023 at 02:33:10PM -0500, Josiah Frentsos wrote:
> diff c7ee7a0aebd0cf0ba96bd4215bd263d8f1dd8e6b 4885ce2b9cddca3392ac68ef4e4ade7a553aaa60

Thanks, committed since this is indeed now an optional argument in some
use cases. And it is already flagged as optional in usage() output.

> commit - c7ee7a0aebd0cf0ba96bd4215bd263d8f1dd8e6b
> commit + 4885ce2b9cddca3392ac68ef4e4ade7a553aaa60
> blob - 5406a92f011218398c65d0d370c7c75302394168
> blob + 7d0875bded8c1d51f61ead9977882e38be0155c7
> --- got/got.1
> +++ got/got.1
> @@ -1973,7 +1973,7 @@ The maximum is 3.
>  .It Xo
>  .Cm cherrypick
>  .Op Fl lX
> -.Ar commit
> +.Op Ar commit
>  .Xc
>  .Dl Pq alias: Cm cy
>  Merge changes from a single
> @@ -2075,7 +2075,7 @@ This option cannot be used with
>  .It Xo
>  .Cm backout
>  .Op Fl lX
> -.Ar commit
> +.Op Ar commit
>  .Xc
>  .Dl Pq alias: Cm bo
>  Reverse-merge changes from a single
> 
>