* [PATCH] gitignore: Don't ignore *.rej
@ 2015-08-12 9:07 Ian Campbell
2015-08-12 9:19 ` Jan Beulich
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ian Campbell @ 2015-08-12 9:07 UTC (permalink / raw)
To: xen-devel; +Cc: Daniel Kiper, ian.jackson, Ian Campbell, jbeulich
These indicate a patch application went wrong, I want to see them in
"git status". This appears to have been imported from .hgignore where
it has been since 2005.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Daniel Kiper <daniel.kiper@oracle.com>
---
Spotted while accidentally reviewing Daniel's patch against grub's
.gitignore.
---
.gitignore | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index bccbd12..dafa3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
.hg
*.orig
-*.rej
*~
*.swp
*.o
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] gitignore: Don't ignore *.rej
2015-08-12 9:07 [PATCH] gitignore: Don't ignore *.rej Ian Campbell
@ 2015-08-12 9:19 ` Jan Beulich
2015-08-12 14:31 ` Konrad Rzeszutek Wilk
2015-08-12 18:09 ` Daniel Kiper
2 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2015-08-12 9:19 UTC (permalink / raw)
To: Ian Campbell; +Cc: Daniel Kiper, ian.jackson, xen-devel
>>> On 12.08.15 at 11:07, <ian.campbell@citrix.com> wrote:
> These indicate a patch application went wrong, I want to see them in
> "git status". This appears to have been imported from .hgignore where
> it has been since 2005.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gitignore: Don't ignore *.rej
2015-08-12 9:07 [PATCH] gitignore: Don't ignore *.rej Ian Campbell
2015-08-12 9:19 ` Jan Beulich
@ 2015-08-12 14:31 ` Konrad Rzeszutek Wilk
2015-08-12 15:21 ` Ian Jackson
2015-08-12 18:09 ` Daniel Kiper
2 siblings, 1 reply; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2015-08-12 14:31 UTC (permalink / raw)
To: Ian Campbell; +Cc: Daniel Kiper, ian.jackson, jbeulich, xen-devel
On Wed, Aug 12, 2015 at 10:07:37AM +0100, Ian Campbell wrote:
> These indicate a patch application went wrong, I want to see them in
> "git status". This appears to have been imported from .hgignore where
> it has been since 2005.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> Spotted while accidentally reviewing Daniel's patch against grub's
> .gitignore.
> ---
> .gitignore | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/.gitignore b/.gitignore
> index bccbd12..dafa3c4 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,6 +1,5 @@
> .hg
> *.orig
> -*.rej
> *~
> *.swp
> *.o
> --
> 2.1.4
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gitignore: Don't ignore *.rej
2015-08-12 14:31 ` Konrad Rzeszutek Wilk
@ 2015-08-12 15:21 ` Ian Jackson
2015-08-13 10:32 ` Ian Campbell
0 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2015-08-12 15:21 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: Daniel Kiper, Ian Campbell, jbeulich, xen-devel
Konrad Rzeszutek Wilk writes ("Re: [Xen-devel] [PATCH] gitignore: Don't ignore *.rej"):
> On Wed, Aug 12, 2015 at 10:07:37AM +0100, Ian Campbell wrote:
> > These indicate a patch application went wrong, I want to see them in
> > "git status". This appears to have been imported from .hgignore where
> > it has been since 2005.
> >
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Daniel Kiper <daniel.kiper@oracle.com>
>
> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
(As an aside, I would normally apply a `usual' kind of trivial
.gitignore update without waiting for any kind of ack. But this one
seems not entirely trivial.)
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] gitignore: Don't ignore *.rej
2015-08-12 15:21 ` Ian Jackson
@ 2015-08-13 10:32 ` Ian Campbell
0 siblings, 0 replies; 6+ messages in thread
From: Ian Campbell @ 2015-08-13 10:32 UTC (permalink / raw)
To: Ian Jackson, Konrad Rzeszutek Wilk; +Cc: Daniel Kiper, jbeulich, xen-devel
On Wed, 2015-08-12 at 16:21 +0100, Ian Jackson wrote:
> Konrad Rzeszutek Wilk writes ("Re: [Xen-devel] [PATCH] gitignore: Don't
> ignore *.rej"):
> > On Wed, Aug 12, 2015 at 10:07:37AM +0100, Ian Campbell wrote:
> > > These indicate a patch application went wrong, I want to see them in
> > > "git status". This appears to have been imported from .hgignore where
> > > it has been since 2005.
> > >
> > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > > Cc: Daniel Kiper <daniel.kiper@oracle.com>
> >
> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> (As an aside, I would normally apply a `usual' kind of trivial
> .gitignore update without waiting for any kind of ack. But this one
> seems not entirely trivial.)
Right, I thought it might even be controversial, but it seems not. I've
applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gitignore: Don't ignore *.rej
2015-08-12 9:07 [PATCH] gitignore: Don't ignore *.rej Ian Campbell
2015-08-12 9:19 ` Jan Beulich
2015-08-12 14:31 ` Konrad Rzeszutek Wilk
@ 2015-08-12 18:09 ` Daniel Kiper
2 siblings, 0 replies; 6+ messages in thread
From: Daniel Kiper @ 2015-08-12 18:09 UTC (permalink / raw)
To: Ian Campbell; +Cc: ian.jackson, jbeulich, xen-devel
On Wed, Aug 12, 2015 at 10:07:37AM +0100, Ian Campbell wrote:
> These indicate a patch application went wrong, I want to see them in
> "git status". This appears to have been imported from .hgignore where
> it has been since 2005.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Daniel Kiper <daniel.kiper@oracle.com>
> ---
> Spotted while accidentally reviewing Daniel's patch against grub's
> .gitignore.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Daniel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-13 10:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-12 9:07 [PATCH] gitignore: Don't ignore *.rej Ian Campbell
2015-08-12 9:19 ` Jan Beulich
2015-08-12 14:31 ` Konrad Rzeszutek Wilk
2015-08-12 15:21 ` Ian Jackson
2015-08-13 10:32 ` Ian Campbell
2015-08-12 18:09 ` Daniel Kiper
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.