grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v2 1/6] gitignore: Ignore *.orig, *.rej and *.swp files


From: Vladimir 'phcoder' Serbinenko
Subject: Re: [PATCH v2 1/6] gitignore: Ignore *.orig, *.rej and *.swp files
Date: Wed, 4 Nov 2015 13:03:56 +0100


Le 12 août 2015 11:04 AM, "Ian Campbell" <address@hidden> a écrit :
>
>
> (Having written the below I see too late that this is a grub patch not a
> Xen one, a tag in the subject for such cross posted patches would be useful
> please. Anyway, my opinion counts for very little in this context but I
> leave it below since already I wrote it. I notice that xen.git#.gitignore
> _does_ list *.rej, which I think is wrong...)
>
> On Mon, 2015-07-20 at 16:35 +0200, Daniel Kiper wrote:
> > Signed-off-by: Daniel Kiper <address@hidden>
>
> At least *.rej and perhaps *.orig are indicative of a failed patch
> application, I think I want them to appear in "git status".
>
> By way of comparison Linux's .gitignore includes *.orig but not *.rej and
> Qemu's includes neither.
>
> So nack to the addition of *.rej from me. I'm more or less ambivalent about
> *.orig.
>
I have to agree. You should clean up *.rej *.orig after fixing conflicts
> > ---
> >  .gitignore |    3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/.gitignore b/.gitignore
> > index 18ab8e8..6d25d39 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -147,6 +147,7 @@ mod-*.c
> >  missing
> >  netboot_test
> >  *.o
> > +*.orig
> >  *.a
> >  ohci_test
> >  partmap_test
> > @@ -160,9 +161,11 @@ po/stamp-po
> >  printf_test
> >  priority_queue_unit_test
> >  pseries_test
> > +*.rej
> >  stamp-h
> >  stamp-h1
> >  stamp-h.in
> > +*.swp
> >  symlist.c
> >  symlist.h
> >  trigtables.c


reply via email to

[Prev in Thread] Current Thread [Next in Thread]