linux-kernel - Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20070718185211.GA5575@martell.zuzino.mipt.ru>
Date:	Wed, 18 Jul 2007 22:52:11 +0400
From:	Alexey Dobriyan <adobriyan@...il.com>
To:	S.Çağlar Onur <caglar@...dus.org.tr>
Cc:	adobriyan@...ru, Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	David Woodhouse <dwmw2@...radead.org>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/