* [U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files
@ 2019-02-05 9:45 Philipp Tomsich
2019-02-06 2:01 ` Masahiro Yamada
0 siblings, 1 reply; 3+ messages in thread
From: Philipp Tomsich @ 2019-02-05 9:45 UTC (permalink / raw)
To: u-boot
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@theobroma-systems.com>
Series-Cc: michal.simek at xilinx.com
Series-Cc: vigneshr at ti.com
---
.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files
2019-02-05 9:45 [U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files Philipp Tomsich
@ 2019-02-06 2:01 ` Masahiro Yamada
2019-02-06 9:54 ` Philipp Tomsich
0 siblings, 1 reply; 3+ messages in thread
From: Masahiro Yamada @ 2019-02-06 2:01 UTC (permalink / raw)
To: u-boot
On Tue, Feb 5, 2019 at 6:45 PM Philipp Tomsich
<philipp.tomsich@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@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" ?
> .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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files
2019-02-06 2:01 ` Masahiro Yamada
@ 2019-02-06 9:54 ` Philipp Tomsich
0 siblings, 0 replies; 3+ messages in thread
From: Philipp Tomsich @ 2019-02-06 9:54 UTC (permalink / raw)
To: u-boot
> On 06.02.2019, at 03:01, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>
> On Tue, Feb 5, 2019 at 6:45 PM Philipp Tomsich
> <philipp.tomsich@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@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-06 9:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-05 9:45 [U-Boot] [PATCH] .gitignore: ignore patch rejects (*.rej) files Philipp Tomsich
2019-02-06 2:01 ` Masahiro Yamada
2019-02-06 9:54 ` Philipp Tomsich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.