Skip to content

Commit

Permalink
Updated .gitignore to exclude *.rej files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmboggs
rmboggs committed Aug 27, 2011
1 parent 798f38e commit cf9e29d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -1,3 +1,4 @@
*.orig
*.swp
*~
*.rej

4 comments on commit cf9e29d

@amitkulz
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does anybody object if we add CVS/ to this?

@lteo
Copy link
Collaborator

@lteo lteo commented on cf9e29d Sep 23, 2011

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO it's a good thing since it will prevent accidental and unnecessary CVS/ commits. So no objections here.

@rmboggs
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me.

@amitkulz
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did it... this page http://pkp.sfu.ca/wiki/index.php/Maintain_git_and_CVS_synchronized mentions to do it in .git/info/exclude but I followed the standard way in .gitignore mentioned here http://www.gelato.unsw.edu.au/archives/git/0609/27575.html

Jasper/Robert, if you don't like it, or if there's something better please fix it. thanks in advance

Please sign in to comment.