# [PATCH] .gitignore git-rerere and config.mak 7 messages from 2006-02-07 to 2006-02-08. Participants: Andreas Ericsson, Junio C Hamano, Johannes Schindelin, Radoslaw Szkodzinski, Jason Riedy. Thread: https://gitlist.dev/t/3260 ## Andreas Ericsson, 2006-02-07 17:23 Subject: [PATCH] .gitignore git-rerere and config.mak Message-ID: <20060207172234.41A975BF02@nox.op5.se> URL: https://gitlist.dev/e/20060207172234.41A975BF02%40nox.op5.se ``` Signed-off-by: Andreas Ericsson --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 0a04811b6d4a6673869cd078471cd1ee6db31e5a diff --git a/.gitignore b/.gitignore index 513f22e..d7e8d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ git-relink git-repack git-repo-config git-request-pull +git-rerere git-reset git-resolve git-rev-list @@ -123,3 +124,4 @@ git-core.spec libgit.a *.o *.py[co] +config.mak -- 1.1.6.g53f3 ``` ## Junio C Hamano, 2006-02-07 18:20 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: <7vk6c7uj21.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vk6c7uj21.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060207172234.41A975BF02@nox.op5.se> ``` Andreas Ericsson writes: > --- a/.gitignore > +++ b/.gitignore > @@ -123,3 +124,4 @@ git-core.spec > libgit.a > *.o > *.py[co] > +config.mak I am not sure about this part. It is plausible that somebody who privately uses config.mak has it in _his_ repository under version control. Should we list it in .gitignore? ``` ## Johannes Schindelin, 2006-02-07 18:52 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0602071951370.26070%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <7vk6c7uj21.fsf@assigned-by-dhcp.cox.net> ``` Hi, On Tue, 7 Feb 2006, Junio C Hamano wrote: > Andreas Ericsson writes: > > > --- a/.gitignore > > +++ b/.gitignore > > @@ -123,3 +124,4 @@ git-core.spec > > libgit.a > > *.o > > *.py[co] > > +config.mak > > I am not sure about this part. It is plausible that somebody > who privately uses config.mak has it in _his_ repository under > version control. Should we list it in .gitignore? I have it in .gitignore. If there were changes to config.mak which I had in all my copies of git, I'd have them directly in the Makefile. Hth, Dscho ``` ## Radoslaw Szkodzinski, 2006-02-07 23:23 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: <43E92BFD.7060909@gorzow.mm.pl> URL: https://gitlist.dev/e/43E92BFD.7060909%40gorzow.mm.pl In-Reply-To: ``` Johannes Schindelin wrote: > Hi, > > On Tue, 7 Feb 2006, Junio C Hamano wrote: > >> Andreas Ericsson writes: >> >>> --- a/.gitignore >>> +++ b/.gitignore >>> @@ -123,3 +124,4 @@ git-core.spec >>> libgit.a >>> *.o >>> *.py[co] >>> +config.mak >> I am not sure about this part. It is plausible that somebody >> who privately uses config.mak has it in _his_ repository under >> version control. Should we list it in .gitignore? > > I have it in .gitignore. If there were changes to config.mak which I had > in all my copies of git, I'd have them directly in the Makefile. > > Hth, > Dscho Somehow git-rerere didn't end up getting included in .gitignore... -- GPG Key id: 0xD1F10BA2 Fingerprint: 96E2 304A B9C4 949A 10A0 9105 9543 0453 D1F1 0BA2 AstralStorm ``` ## Junio C Hamano, 2006-02-08 01:01 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: <7vpslyr7eb.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vpslyr7eb.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <43E92BFD.7060909@gorzow.mm.pl> ``` Radoslaw Szkodzinski writes: > Somehow git-rerere didn't end up getting included in .gitignore... Sorry for a bit confusing style of quoting. I edited that part out, which I did not disagree with, when I commented on the patch. ``` ## Jason Riedy, 2006-02-08 03:55 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: <1303.1139370931@lotus.CS.Berkeley.EDU> URL: https://gitlist.dev/e/1303.1139370931%40lotus.CS.Berkeley.EDU In-Reply-To: <7vk6c7uj21.fsf@assigned-by-dhcp.cox.net> ``` And Junio C Hamano writes: - I am not sure about this part. It is plausible that somebody - who privately uses config.mak has it in _his_ repository under - version control. Like me. That way I don't have to worry about conflicts in the Makefile. But I can change .gitignore in those branches... Jason ``` ## Junio C Hamano, 2006-02-08 05:34 Subject: Re: [PATCH] .gitignore git-rerere and config.mak Message-ID: <7vlkwmquqj.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vlkwmquqj.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <1303.1139370931@lotus.CS.Berkeley.EDU> ``` Jason Riedy writes: > And Junio C Hamano writes: > - I am not sure about this part. It is plausible that somebody > - who privately uses config.mak has it in _his_ repository under > - version control. > > Like me. That way I don't have to worry about conflicts in the > Makefile. But I can change .gitignore in those branches... Or you can leave that as is. .gitignore is used to sift untracked files into two categories - ignored and unknown. So my initial worry was unfounded. Sorry for the noise. ```