[PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[S.ÃaÄlar Onur]

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@xxxxxxxxxxxxx>
 
 .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@xxxxxxxxxxxxx>
http://cekirdek.pardus.org.tr/~caglar/

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

Attachment: signature.asc
Description: This is a digitally signed message part.