2006/5/17, Junio C Hamano <junkio@cox.net>:
quoted text
> Santi <sbejar@gmail.com> writes:
>
> >       In the case of:
> >
> > - You merge from a branch with new files
> > - You have these files in the working directory
> > - You do not have these files in the HEAD.
>
> and
>
>  - You have not told git that these files matter.

For me it is the other way, all my files matter but git can do
whatever it wants with the ones it controls.

quoted text
>
> This is totally untested, but on top of "next" you could do
> something like this, perhaps.

Thanks, it works here.

Santi
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html