{"thread":{"id":"3260","subject":"[PATCH] .gitignore git-rerere and config.mak","startedAt":"2006-02-07T17:23:12Z","lastAt":"2006-02-08T05:34:28Z","messageCount":7,"participants":["Andreas Ericsson","Junio C Hamano","Johannes Schindelin","Radoslaw Szkodzinski","Jason Riedy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"15678","messageId":"20060207172234.41A975BF02@nox.op5.se","threadId":"3260","inReplyTo":null,"subject":"[PATCH] .gitignore git-rerere and config.mak","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-02-07T17:23:12Z","receivedAt":"2006-02-07T17:23:12Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Signed-off-by: Andreas Ericsson \n\n---\n\n .gitignore | 2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\n0a04811b6d4a6673869cd078471cd1ee6db31e5a\ndiff --git a/.gitignore b/.gitignore\nindex 513f22e..d7e8d2a 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -78,6 +78,7 @@ git-relink\n git-repack\n git-repo-config\n git-request-pull\n+git-rerere\n git-reset\n git-resolve\n git-rev-list\n@@ -123,3 +124,4 @@ git-core.spec\n libgit.a\n *.o\n *.py[co]\n+config.mak\n-- \n1.1.6.g53f3\n"},{"id":"15681","messageId":"7vk6c7uj21.fsf@assigned-by-dhcp.cox.net","threadId":"3260","inReplyTo":"20060207172234.41A975BF02@nox.op5.se","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-07T18:20:54Z","receivedAt":"2006-02-07T18:20:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Ericsson writes:\n\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -123,3 +124,4 @@ git-core.spec\n> libgit.a\n> *.o\n> *.py[co]\n> +config.mak\n\nI am not sure about this part. It is plausible that somebody\nwho privately uses config.mak has it in _his_ repository under\nversion control. Should we list it in .gitignore?\n"},{"id":"15685","messageId":"Pine.LNX.4.63.0602071951370.26070@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3260","inReplyTo":"7vk6c7uj21.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-02-07T18:52:37Z","receivedAt":"2006-02-07T18:52:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 7 Feb 2006, Junio C Hamano wrote:\n\n> Andreas Ericsson writes:\n> \n> > --- a/.gitignore\n> > +++ b/.gitignore\n> > @@ -123,3 +124,4 @@ git-core.spec\n> > libgit.a\n> > *.o\n> > *.py[co]\n> > +config.mak\n> \n> I am not sure about this part. It is plausible that somebody\n> who privately uses config.mak has it in _his_ repository under\n> version control. Should we list it in .gitignore?\n\nI have it in .gitignore. If there were changes to config.mak which I had \nin all my copies of git, I'd have them directly in the Makefile.\n\nHth,\nDscho\n"},{"id":"15703","messageId":"43E92BFD.7060909@gorzow.mm.pl","threadId":"3260","inReplyTo":"Pine.LNX.4.63.0602071951370.26070@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Radoslaw Szkodzinski","fromEmail":"astralstorm@gorzow.mm.pl","sentAt":"2006-02-07T23:23:41Z","receivedAt":"2006-02-07T23:23:41Z","isPatch":true,"sender":{"key":"astralstorm@gorzow.mm.pl","avatar":null},"body":"Johannes Schindelin wrote:\n> Hi,\n> \n> On Tue, 7 Feb 2006, Junio C Hamano wrote:\n> \n>> Andreas Ericsson writes:\n>>\n>>> --- a/.gitignore\n>>> +++ b/.gitignore\n>>> @@ -123,3 +124,4 @@ git-core.spec\n>>> libgit.a\n>>> *.o\n>>> *.py[co]\n>>> +config.mak\n>> I am not sure about this part. It is plausible that somebody\n>> who privately uses config.mak has it in _his_ repository under\n>> version control. Should we list it in .gitignore?\n> \n> I have it in .gitignore. If there were changes to config.mak which I had \n> in all my copies of git, I'd have them directly in the Makefile.\n> \n> Hth,\n> Dscho\n\nSomehow git-rerere didn't end up getting included in .gitignore...\n\n-- \nGPG Key id: 0xD1F10BA2\nFingerprint: 96E2 304A B9C4 949A 10A0 9105 9543 0453 D1F1 0BA2\n\nAstralStorm\n\n"},{"id":"15705","messageId":"7vpslyr7eb.fsf@assigned-by-dhcp.cox.net","threadId":"3260","inReplyTo":"43E92BFD.7060909@gorzow.mm.pl","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-08T01:01:00Z","receivedAt":"2006-02-08T01:01:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Radoslaw Szkodzinski writes:\n\n> Somehow git-rerere didn't end up getting included in .gitignore...\n\nSorry for a bit confusing style of quoting. I edited that part out,\nwhich I did not disagree with, when I commented on the patch.\n"},{"id":"15708","messageId":"1303.1139370931@lotus.CS.Berkeley.EDU","threadId":"3260","inReplyTo":"7vk6c7uj21.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Jason Riedy","fromEmail":"ejr@eecs.berkeley.edu","sentAt":"2006-02-08T03:55:31Z","receivedAt":"2006-02-08T03:55:31Z","isPatch":true,"sender":{"key":"ejr@eecs.berkeley.edu","avatar":"https://gravatar.com/avatar/547fa56f887cab01599edab4e9f813c949c1269e02714f20e0496c56185d9837?d=mp&s=160"},"body":"And Junio C Hamano writes:\n - I am not sure about this part. It is plausible that somebody\n - who privately uses config.mak has it in _his_ repository under\n - version control.\n\nLike me. That way I don't have to worry about conflicts in the\nMakefile. But I can change .gitignore in those branches...\n\nJason\n"},{"id":"15709","messageId":"7vlkwmquqj.fsf@assigned-by-dhcp.cox.net","threadId":"3260","inReplyTo":"1303.1139370931@lotus.CS.Berkeley.EDU","subject":"Re: [PATCH] .gitignore git-rerere and config.mak","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-08T05:34:28Z","receivedAt":"2006-02-08T05:34:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jason Riedy writes:\n\n> And Junio C Hamano writes:\n> - I am not sure about this part. It is plausible that somebody\n> - who privately uses config.mak has it in _his_ repository under\n> - version control.\n>\n> Like me. That way I don't have to worry about conflicts in the\n> Makefile. But I can change .gitignore in those branches...\n\nOr you can leave that as is. .gitignore is used to sift\nuntracked files into two categories - ignored and unknown. So\nmy initial worry was unfounded.\n\nSorry for the noise.\n"}]}