Skip to contentSkip to conversation

.gitignore git-rerere and config.mak

PATCH In review Jason Riedy 5 participants 7 messages Jun 15, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20060207182234

Andreas Ericsson

#1 lore raw

PATCH 1/1 .gitignore git-rerere and config.mak

Signed-off-by Andreas Ericsson <[email protected]>

---

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

0a04811b6d4a6673869cd078471cd1ee6db31e5a

.gitignore +2 -0
index 513f22e..d7e8d2a 100644
@@ -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
Signature · 1 line
1.1.6.g53f3
#2 lore raw

.gitignore git-core.spec · line 127

Quoted 7 lines · Andreas Ericsson
.gitignore +1 -0
@@ -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?

author
#3 lore raw

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

#4 lore raw
Quoted 7 lines · Jason Riedy

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.

#5 lore raw
In reply to Junio C Hamano

Hi,

Quoted 13 lines · Junio C Hamano

.gitignore git-core.spec · line 127

Quoted 7 lines · Andreas Ericsson
.gitignore +1 -0
@@ -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

#6 lore raw
Quoted 17 lines · Johannes Schindelin

Hi,

Quoted 12 lines · Junio C Hamano

.gitignore git-core.spec · line 127

Quoted 7 lines · Andreas Ericsson
.gitignore +1 -0
@@ -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?

Quoted 5 lines

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

Signature · 4 lines
GPG Key id:  0xD1F10BA2
Fingerprint: 96E2 304A B9C4 949A 10A0  9105 9543 0453 D1F1 0BA2

AstralStorm
#7 lore raw
Quoted 1 line · Radoslaw Szkodzinski

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.