threads / patch / 3260

patch.gitignore git-rerere and config.mak

Subject: [PATCH] .gitignore git-rerere and config.mak

## tl;dr

7 messages between Feb 7, 2006 and Feb 8, 2006. Diffs are folded; open one to read it.

replies: 6people: 5as markdown or json

Andreas Ericsson· Feb 7, 2006, 17:23 UTC · lore

Signed-off-by: Andreas Ericsson <ae@op5.se>

---

 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

0a04811b6d4a6673869cd078471cd1ee6db31e5a

Show changes to .gitignore +2 −0

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· Feb 7, 2006, 18:20 UTC · re: Andreas Ericsson · lore

Re: [PATCH] .gitignore git-rerere and config.mak

Andreas Ericsson <ae@op5.se> writes:

Show 7 quoted lines

> --- 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· Feb 7, 2006, 18:52 UTC · re: Junio C Hamano · lore

Re: [PATCH] .gitignore git-rerere and config.mak

Hi,

On Tue, 7 Feb 2006, Junio C Hamano wrote:

Show 13 quoted lines

> Andreas Ericsson <ae@op5.se> 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· Feb 7, 2006, 23:23 UTC · re: Johannes Schindelin · lore

Re: [PATCH] .gitignore git-rerere and config.mak

Johannes Schindelin wrote:

Show 22 quoted lines

> Hi,
> 
> On Tue, 7 Feb 2006, Junio C Hamano wrote:
> 
>> Andreas Ericsson <ae@op5.se> 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· Feb 8, 2006, 01:01 UTC · re: Radoslaw Szkodzinski · lore

Re: [PATCH] .gitignore git-rerere and config.mak

Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> 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· Feb 8, 2006, 03:55 UTC · re: Junio C Hamano · lore

Re: [PATCH] .gitignore git-rerere and config.mak

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· Feb 8, 2006, 05:34 UTC · re: Jason Riedy · lore

Re: [PATCH] .gitignore git-rerere and config.mak

Jason Riedy <ejr@EECS.Berkeley.EDU> writes:

Show 7 quoted lines

> 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.