Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[Alexey Dobriyan]

On Wed, Jul 18, 2007 at 09:03:13PM +0300, S.ÃaÄlar Onur wrote:
> With 3f1b0e1f287547903f11fa1e6de7d2765597766e Linus's current git tree starts 
> to ignore any *.orig or *.rej files (for example "git status" cannot show 
> what are they) but if there are some *.orig or *.rej files exists, for 
> whatever reason, that means some unresolved merge conflicts occured for that 
> code tree and this tree is no longer trusted so better not to ignore these.

*.orig are generated even if line numbers change a bit, so untrusted is
a somewhat exaggerated.

> --- a/.gitignore
> +++ b/.gitignore
> @@ -45,6 +45,3 @@ series
>  
>  # cscope files
>  cscope.*
> -
> -*.orig
> -*.rej

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/