mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
1f5d3a6b65
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>
59 lines
676 B
Plaintext
59 lines
676 B
Plaintext
#
|
|
# NOTE! Don't add files that are generated in specific
|
|
# subdirectories here. Add them in the ".gitignore" file
|
|
# in that subdirectory instead.
|
|
#
|
|
# Normal rules
|
|
#
|
|
.*
|
|
*.o
|
|
*.o.*
|
|
*.a
|
|
*.s
|
|
*.ko
|
|
*.so
|
|
*.so.dbg
|
|
*.mod.c
|
|
*.i
|
|
*.lst
|
|
*.symtypes
|
|
*.order
|
|
|
|
#
|
|
# Top-level generic files
|
|
#
|
|
tags
|
|
TAGS
|
|
vmlinux*
|
|
!vmlinux.lds.S
|
|
System.map
|
|
Module.markers
|
|
Module.symvers
|
|
!.gitignore
|
|
|
|
#
|
|
# Generated include files
|
|
#
|
|
include/asm
|
|
include/asm-*/asm-offsets.h
|
|
include/config
|
|
include/linux/autoconf.h
|
|
include/linux/compile.h
|
|
include/linux/version.h
|
|
include/linux/utsrelease.h
|
|
include/linux/bounds.h
|
|
|
|
# stgit generated dirs
|
|
patches-*
|
|
|
|
# quilt's files
|
|
patches
|
|
series
|
|
|
|
# cscope files
|
|
cscope.*
|
|
|
|
*.orig
|
|
*~
|
|
\#*#
|