From: S.Çağlar Onur Date: Fri, 2 May 2008 11:10:08 +0000 (+0300) Subject: Remove *.rej pattern from .gitignore X-Git-Tag: v2.6.26-rc4~124^2~4 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=1f5d3a6b6532e25a5cdf1f311956b2b03d343a48 Remove *.rej pattern from .gitignore With commit 3f1b0e1f287547903f11fa1e6de7d2765597766e ".gitignore update" 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. Signed-off-by: S.Çağlar Onur Signed-off-by: Sam Ravnborg --- diff --git a/.gitignore b/.gitignore index 090b293..9c0d650 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,5 @@ series cscope.* *.orig -*.rej *~ \#*#