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

From:
Omar Polo <op@omarpolo.com>
Subject:
Re: make got status show interrupted operations
To:
Stefan Sperling <stsp@stsp.name>
Cc:
gameoftrees@openbsd.org
Date:
Thu, 28 Mar 2024 15:26:32 +0100

Download raw body.

Thread
On 2024/03/28 14:59:07 +0100, Stefan Sperling <stsp@stsp.name> wrote:
> This small UI tweak makes it easier to users to identify whether
> a work tree is currently in an interrupted operation. ok?

I like it; ok op@

one nit:

> --- got/got.1
> +++ got/got.1
> @@ -823,6 +823,12 @@ Changes created on top of staged changes are indicated
>  .It MA Ta file was modified after having been staged for addition
>  .El
>  .Pp
> +If the work tree contains the results of an interrupted
> +.Cm got rebase ,
> +.Cm got histedit, or

   .Cm got histedit ,
   or

> +.Cm got merge
> +operation then display a message which shows the branches involved.
> +.Pp
>  The options for
>  .Cm got status
>  are as follows: