linux-kernel - [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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <200707182103.13500.caglar@pardus.org.tr>
Date:	Wed, 18 Jul 2007 21:03:13 +0300
From:	"S.Çağlar Onur" <caglar@...dus.org.tr>
To:	adobriyan@...ru
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	David Woodhouse <dwmw2@...radead.org>,
	linux-kernel@...r.kernel.org
Subject: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

Hi;

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.

Signed-off-by: S.Çağlar Onur <caglar@...dus.org.tr>

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d15830..060a71d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,3 @@ series

 # cscope files
 cscope.*
-
-*.orig
-*.rej

Cheers
-- 
S.Çağlar Onur <caglar@...dus.org.tr>
http://cekirdek.pardus.org.tr/~caglar/

Linux is like living in a teepee. No Windows, no Gates and an Apache in house!

Download attachment "signature.asc " of type "application/pgp-signature" (190 bytes)