* [PATCH] kbuild: add *.rej pattern to .gitignore @ 2010-04-21 11:47 Guennadi Liakhovetski 2010-04-21 15:28 ` Américo Wang 0 siblings, 1 reply; 5+ messages in thread From: Guennadi Liakhovetski @ 2010-04-21 11:47 UTC (permalink / raw) To: Michal Marek; +Cc: linux-kernel Tell git to ignore .rej files, generated by patch(1). Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- diff --git a/.gitignore b/.gitignore index a2939fc..17ababa 100644 --- a/.gitignore +++ b/.gitignore @@ -74,5 +74,6 @@ GSYMS GTAGS *.orig +*.rej *~ \#*# ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] kbuild: add *.rej pattern to .gitignore 2010-04-21 11:47 [PATCH] kbuild: add *.rej pattern to .gitignore Guennadi Liakhovetski @ 2010-04-21 15:28 ` Américo Wang 2010-04-21 15:31 ` Guennadi Liakhovetski 0 siblings, 1 reply; 5+ messages in thread From: Américo Wang @ 2010-04-21 15:28 UTC (permalink / raw) To: Guennadi Liakhovetski; +Cc: Michal Marek, linux-kernel On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote: >Tell git to ignore .rej files, generated by patch(1). > >Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> NACK. You have to handle *.rej files, not leaving them there. >--- >diff --git a/.gitignore b/.gitignore >index a2939fc..17ababa 100644 >--- a/.gitignore >+++ b/.gitignore >@@ -74,5 +74,6 @@ GSYMS > GTAGS > > *.orig >+*.rej > *~ > \#*# >-- >To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html >Please read the FAQ at http://www.tux.org/lkml/ -- Live like a child, think like the god. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kbuild: add *.rej pattern to .gitignore 2010-04-21 15:28 ` Américo Wang @ 2010-04-21 15:31 ` Guennadi Liakhovetski 2010-04-21 16:33 ` Américo Wang 0 siblings, 1 reply; 5+ messages in thread From: Guennadi Liakhovetski @ 2010-04-21 15:31 UTC (permalink / raw) To: Américo Wang; +Cc: Michal Marek, linux-kernel On Wed, 21 Apr 2010, Américo Wang wrote: > On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote: > >Tell git to ignore .rej files, generated by patch(1). > > > >Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > NACK. > > You have to handle *.rej files, not leaving them there. Hm? I know I have to handle them, and I do handle them, but IMHO it's entirely valid and up to the user to leave them where they are. You could apply similar argument to *.orig or to *~ files. In other words, I'm not convinced. Thanks Guennadi > >--- > >diff --git a/.gitignore b/.gitignore > >index a2939fc..17ababa 100644 > >--- a/.gitignore > >+++ b/.gitignore > >@@ -74,5 +74,6 @@ GSYMS > > GTAGS > > > > *.orig > >+*.rej > > *~ > > \#*# --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kbuild: add *.rej pattern to .gitignore 2010-04-21 15:31 ` Guennadi Liakhovetski @ 2010-04-21 16:33 ` Américo Wang 2010-04-21 20:22 ` Michal Marek 0 siblings, 1 reply; 5+ messages in thread From: Américo Wang @ 2010-04-21 16:33 UTC (permalink / raw) To: Guennadi Liakhovetski; +Cc: Américo Wang, Michal Marek, linux-kernel On Wed, Apr 21, 2010 at 05:31:34PM +0200, Guennadi Liakhovetski wrote: >On Wed, 21 Apr 2010, Américo Wang wrote: > >> On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote: >> >Tell git to ignore .rej files, generated by patch(1). >> > >> >Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >> >> NACK. >> >> You have to handle *.rej files, not leaving them there. > >Hm? I know I have to handle them, and I do handle them, but IMHO it's >entirely valid and up to the user to leave them where they are. You could >apply similar argument to *.orig or to *~ files. In other words, I'm not >convinced. > I am not the only people who is against this, there was a discussion about this before, please search lkml archive. Thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kbuild: add *.rej pattern to .gitignore 2010-04-21 16:33 ` Américo Wang @ 2010-04-21 20:22 ` Michal Marek 0 siblings, 0 replies; 5+ messages in thread From: Michal Marek @ 2010-04-21 20:22 UTC (permalink / raw) To: Américo Wang; +Cc: Guennadi Liakhovetski, linux-kernel On 21.4.2010 18:33, Américo Wang wrote: > On Wed, Apr 21, 2010 at 05:31:34PM +0200, Guennadi Liakhovetski wrote: >> On Wed, 21 Apr 2010, Américo Wang wrote: >>> On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote: >>>> Tell git to ignore .rej files, generated by patch(1). >>>> >>>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >>> NACK. >>> >>> You have to handle *.rej files, not leaving them there. >> Hm? I know I have to handle them, and I do handle them, but IMHO it's >> entirely valid and up to the user to leave them where they are. You could >> apply similar argument to *.orig or to *~ files. In other words, I'm not >> convinced. >> > > I am not the only people who is against this, there > was a discussion about this before, please search lkml > archive. ...and there is no point in starting the flamewar again. If you want to ignore *.rej files, which is a perfectly valid personal preference, I suggeest you add the pattern to .git/info/exclude. hth, Michal ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-04-21 20:22 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-04-21 11:47 [PATCH] kbuild: add *.rej pattern to .gitignore Guennadi Liakhovetski 2010-04-21 15:28 ` Américo Wang 2010-04-21 15:31 ` Guennadi Liakhovetski 2010-04-21 16:33 ` Américo Wang 2010-04-21 20:22 ` Michal Marek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox