Skip to content

Commit

Permalink
Remove *.rej pattern from .gitignore
Browse files Browse the repository at this point in the history
With commit 3f1b0e1 ".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 <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
  • Loading branch information
caglar10ur authored and sravnborg committed May 11, 2008
1 parent 591b017 commit 1f5d3a6
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@ series
cscope.*

*.orig
*.rej
*~
\#*#

0 comments on commit 1f5d3a6

Please sign in to comment.