OpenVZ Forum - RDF feed
type: channel
items: [PATCH] .gitignore update
items: Re: [PATCH] .gitignore update

[PATCH] .gitignore update
type: item
description: 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
creator: Alexey Dobriyan
date: 2007-07-04T11:07:19-00:00

Re: [PATCH] .gitignore update
type: item
description: > 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
creator: Segher Boessenkool
date: 2007-07-04T13:23:02-00:00