diff options
| author | S.Çağlar Onur <caglar@pardus.org.tr> | 2008-05-02 13:10:08 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-05-11 10:19:54 +0200 |
| commit | 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48 (patch) | |
| tree | cdaaf91d9197163821f75c2ac7441be11f3edefa /.gitignore | |
| parent | MAINTAINERS: document names of new kbuild trees (diff) | |
| download | linux-1f5d3a6b6532e25a5cdf1f311956b2b03d343a48.tar.xz linux-1f5d3a6b6532e25a5cdf1f311956b2b03d343a48.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 090b293b8779..9c0d650385be 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,5 @@ series cscope.* *.orig -*.rej *~ \#*# |