On Tue, Feb 5, 2019 at 6:45 PM Philipp Tomsich <philipp.toms...@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.toms...@theobroma-systems.com> > Series-Cc: michal.si...@xilinx.com > Series-Cc: vigne...@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@lists.denx.de > https://lists.denx.de/listinfo/u-boot -- Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
