Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

["S.Çağlar Onur" <caglar@pardus.org.tr>]

Hi;

18 Tem 2007 Çar tarihinde, Alexey Dobriyan şunları yazmıştı: 
> *.orig are generated even if line numbers change a bit, so untrusted is
> a somewhat exaggerated.

:), although i prefer previous one, what about something like following?


With 3f1b0e1f287547903f11fa1e6de7d2765597766e Linus's current git tree starts 
to ignore any *.rej files (for example "git status" cannot show what are 
they) but if there are some *.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 this.

Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
 
 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d15830..e3a56e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,3 @@ series
 cscope.*
 
 *.orig
-*.rej

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

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