Re: [PATCH] Build in merge

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jul 8, 2008, 01:41 UTC
Message-ID: <20080708014109.GC10347@genesis.frugalware.org>
In-Reply-To: <7vskulxk0o.fsf@gitster.siamese.dyndns.org>

On Mon, Jul 07, 2008 at 06:05:43PM -0700, Junio C Hamano <gitster@pobox.com> wrote:

Show 7 quoted lines

> > 1) A project has code in a repo, some documentation and po files.
> >
> > The first two can be merged with builtin strategies, the later probably
> > needs a custom merge driver.
> 
> Per-path merge is probably better handled with custom ll-merge driver
> anyway.  See gitattributes(5).

Ah, thanks. I did not know ll-merge supports custom drivers as well.

Show 6 quoted lines

> It wasn't *me* ;-) who wanted to add these "flags".
> 
> I think it does not matter what "my-strategy" does unless "-s my-strategy"
> (or pull.twohead) is explicitly given by the user, and at that time,
> DEFAULT_* options should not matter.  It probably is Ok to allow fast
> forward and trivial merges to them.  We'll see.

OK, so at first round I think we could avoid flags for custom strategies.

For the error message, I think the output could be something like git help --all, which splits commands based on being in GIT_EXEC_PATH or somewhere else in PATH.

Also, currently (the shell version and the C one as well) we silently ignore the config setting if it's set to semething invalid. What about changing that to a similar error message as well?