[PATCH] Remove *.rej pattern from .gitignore

From: S.ÃaÄlar Onur
Date: Fri May 02 2008 - 07:10:45 EST


Hi;

With commit "3f1b0e1f287547903f11fa1e6de7d2765597766e" Linus's current git tree starts to ignore any "*.rej" files. So "git status" no longer shows these files, but the ones who works with quilt patchsets, this not makes life easier as expected. Because sometimes a work flow (at least for me) requires "quilt push -f" followed by "git status" to see unresolved merge conflicts, work on these conflicts to correct them and finalize the patch with "quilt refresh".

And if there are some "*.rej" files exists in tree, for whatever reason, this means something goes really wrong there and i think this situation not deserves to be ignored.

This is the second time i came across with this patch cause the first one (http://lkml.org/lkml/2007/7/18/327) ends up nowhere :)

Signed-off-by: S.ÃaÄlar Onur <caglar@xxxxxxxxxxxxx>

diff --git a/.gitignore b/.gitignore
index 090b293..9c0d650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,5 @@ series
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!
--
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/