[PATCH] .gitignore update [message #14652] |
Wed, 04 July 2007 11:07 |
Alexey Dobriyan
Messages: 195 Registered: August 2006
|
Senior Member |
|
|
headers_install by default puts headers into usr/include/ .
They're auto-generated, so should be ignored.
Same for *.orig, *.rej .
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
---
.gitignore | 3 +++
usr/.gitignore | 1 +
2 files changed, 4 insertions(+)
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ series
# cscope files
cscope.*
+
+*.orig
+*.rej
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -5,3 +5,4 @@ gen_init_cpio
initramfs_data.cpio
initramfs_data.cpio.gz
initramfs_list
+include
|
|
|
Re: [PATCH] .gitignore update [message #14932 is a reply to message #14652] |
Wed, 04 July 2007 13:23 |
Segher Boessenkool
Messages: 1 Registered: July 2007
|
Junior Member |
|
|
> headers_install by default puts headers into usr/include/ .
> They're auto-generated, so should be ignored.
>
> Same for *.orig, *.rej .
If you have .orig or .rej files hanging around, it means you
have an unresolved merge conflict. Better not ignore it.
Segher
|
|
|