[rebase PATCH] Introduce --merge-files (-M) flag (WAS: Introduce --no-rebase flag)

[Corinna Vinschen]

On Jun  3 18:30, Corinna Vinschen wrote:
> On May  6 10:31, Michael Haubenwallner wrote:
> > 
> > On 5/4/19 4:33 PM, Brian Inglis wrote:
> > > On 2019-05-03 09:32, Michael Haubenwallner wrote:
> > >> On 4/12/19 8:03 PM, Corinna Vinschen wrote:
> > >>> On Apr 12 15:52, Michael Haubenwallner wrote:
> > >>>> The --no-rebase flag is to update the database for new files, without
> > >>> Wouldn't something like --merge-files be more descriptive?
> > >> What about --recognize ?
> > > 
> > > "The --recognize flag is to update the database for new files, without
> > > performing a rebase.  The file names provided should have been rebased
> > > using the --oblivious flag just before."
> > > 
> > > Recognize does not mean record or update in English but see, identify, or
> > > acknowledge.
> > > 
> > > Your earlier suggestion of --record, the verb used in the comment quoted above
> > > --update, or CV's suggestion --merge-files would make sense and be more
> > > descriptive.
> > 
> > On a first thought, "merge files" does have a different meaning in the Gentoo
> > context already, as in "merge files from staging directory into the live file
> > system".
> > However, on a second thought, "rebase --merge-files" is performed afterwards,
> > but still part of that "merge files" phase, so the name does actually fit.
> > 
> > Patch updated.
> 
> Pushed.

Just a FYI for the future, patches to Cygwin-specific tools should
usually go to cygwin-apps.  Not that the traffic here overwhelms
anybody...


Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://cygwin.com/pipermail/cygwin-patches/attachments/20190603/08fb5eab/attachment.sig>