mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
Remove *.rej pattern from .gitignore
With commit 3f1b0e1f28
".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>
This commit is contained in:
parent
591b0179e8
commit
1f5d3a6b65
1
.gitignore
vendored
1
.gitignore
vendored
@ -54,6 +54,5 @@ series
|
|||||||
cscope.*
|
cscope.*
|
||||||
|
|
||||||
*.orig
|
*.orig
|
||||||
*.rej
|
|
||||||
*~
|
*~
|
||||||
\#*#
|
\#*#
|
||||||
|
Loading…
Reference in New Issue
Block a user