aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS.Çağlar Onur <caglar@pardus.org.tr>2008-05-02 14:10:08 +0300
committerSam Ravnborg <sam@ravnborg.org>2008-05-11 10:19:54 +0200
commit1f5d3a6b6532e25a5cdf1f311956b2b03d343a48 (patch)
treecdaaf91d9197163821f75c2ac7441be11f3edefa
parent591b0179e80f7d59b5e6e57063e92fdbface98fb (diff)
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 <caglar@pardus.org.tr> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 090b293b877..9c0d650385b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,5 @@ series
cscope.*
*.orig
-*.rej
*~
\#*#