Skip to contentSkip to conversation

.gitignore update

PATCH In review Alexey Dobriyan 2 participants 2 messages Jul 4, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 .gitignore update

headers_install by default puts headers into usr/include/ . They're auto-generated, so should be ignored.

Same for *.orig, *.rej .

---

 .gitignore     |    3 +++
 usr/.gitignore |    1 +
 2 files changed, 4 insertions(+)
.gitignore +3 -0
@@ -45,3 +45,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej
usr/.gitignore +1 -0
@@ -5,3 +5,4 @@ gen_init_cpio
 initramfs_data.cpio
 initramfs_data.cpio.gz
 initramfs_list
+include
#1 lore raw
Quoted 4 lines

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