From: Stefan Sperling <stsp@stsp.name>
Subject: Re: add a 'got merge' command
To: Tracey Emery <tracey@traceyemery.net>
Cc: gameoftrees@openbsd.org
Date: Fri, 24 Sep 2021 21:53:37 +0200

On Fri, Sep 24, 2021 at 01:42:44PM -0600, Tracey Emery wrote:
> On Fri, Sep 24, 2021 at 06:35:57PM +0200, Stefan Sperling wrote:
> > Adding a merge command is an item in our TODO file, and it was now also
> > requested by a -portable user on IRC. This patch provides an initial
> > implementation to accommodate workflows which mandate merge commits.
> > 
> > This does not yet implement the "sub directory" merge idea mentioned
> > in the TODO file. That requires more work and would also apply to
> > other commands which merge changes, such as cherrypick and backout.
> > 
> > Test coverage could be improved but I wanted to share what I already have.
> > 
> > ok?
> 
> See changes and thoughts below. Otherwise, ok.
> 
> > 
> > diff refs/heads/main refs/heads/merge-cmd
> > blob - 7908e0d4a3f37ad292df5a94592a0e75437876a3
> > blob + 47ed7daac9b47b50711a04958e81be7d7cddafb8
> > --- got/got.1
> > +++ got/got.1
> > @@ -2132,6 +2132,123 @@ or reverted with
> >  .It Cm ig
> >  Short alias for
> >  .Cm integrate .
> > +.It Cm merge Oo Fl a Oc Oo Fl c Oc Op Ar branch
> 
> branch is required? rm Op

Branch is only required if neither -a or -c is used.

Not sure how to best express this in the synopsis line. I hope that
the text makes it clear.

I've merged your other fixes in, thank you!