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

4 messages, 4 authors, 2016-06-15 · open the first message on its own page

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:18

Andreas Ericsson [off-list ref] writes:
quoted hunk
--- 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?

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

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:18

Hi,

On Tue, 7 Feb 2006, Junio C Hamano wrote:
Andreas Ericsson [off-list ref] writes:
quoted
--- 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

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

From: Radoslaw Szkodzinski <hidden>
Date: 2016-06-15 22:42:18

Johannes Schindelin wrote:
Hi,

On Tue, 7 Feb 2006, Junio C Hamano wrote:
quoted
Andreas Ericsson [off-list ref] writes:
quoted
--- 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

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

From: Jason Riedy <hidden>
Date: 2016-06-15 22:42:18

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help