[U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files

Philipp Tomsich philipp.tomsich at theobroma-systems.com
Wed Feb 6 09:54:01 UTC 2019



> On 06.02.2019, at 03:01, Masahiro Yamada <yamada.masahiro at socionext.com> wrote:
> 
> On Tue, Feb 5, 2019 at 6:45 PM Philipp Tomsich
> <philipp.tomsich at theobroma-systems.com> wrote:
>> 
>> As my last merge (and the successive follow-up patch) shows, *.rej
>> files are not covered by our .gitignore.  To protect against future
>> accidental addition of *.rej artifacts, this adds a pattern for these
>> to our .gitignore.
>> 
>> Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
>> Series-Cc: michal.simek at xilinx.com
>> Series-Cc: vigneshr at ti.com
>> ---
> 
> 
> In fact, Linux kernel used to ignore *.rej in old days,
> but chose to not do that.
> 
> See this commit:
> https://github.com/torvalds/linux/commit/1f5d3a6b6532e25a5cdf1f311956b2b03d343a48
> 
> 
> Having said that, U-Boot does not necessarily
> need to stick to it.
> 
> It is up to Tom.
> 
> 
> BTW, are you aware of
> "No newline at end of file” ?

I missed that one.

Usually I rely on patman to give me a warning.
I’ll dig to find out why it didn’t.

>> .gitignore | 3 +++
>> 1 file changed, 3 insertions(+)
>> 
>> diff --git a/.gitignore b/.gitignore
>> index 8d18d6f..1ef876a 100644
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -88,3 +88,6 @@ GTAGS
>> *.orig
>> *~
>> \#*#
>> +
>> +# patch rejects
>> +*.rej
>> \ No newline at end of file
>> --
>> 2.1.4
>> 
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> https://lists.denx.de/listinfo/u-boot
> 
> 
> 
> --
> Best Regards
> Masahiro Yamada



More information about the U-Boot mailing list