Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

markdown fixes #38

Merged
merged 4 commits into from Aug 28, 2015

Conversation

@manonthemat
Copy link
Contributor

manonthemat commented Aug 28, 2015

No description provided.

.gitignore Outdated
@@ -1,5 +1,6 @@
.idea
*.iml
*.swp

This comment has been minimized.

Copy link
@cjihrig

cjihrig Aug 28, 2015

Contributor

Can you remove this please.

This comment has been minimized.

Copy link
@manonthemat

manonthemat Aug 28, 2015

Author Contributor

you don't like vim (users)? 😕

This comment has been minimized.

Copy link
@cjihrig

cjihrig Aug 28, 2015

Contributor

I don't use it personally, but I checked a couple other .gitignore files in hapi repos and didn't see it.

This comment has been minimized.

Copy link
@manonthemat

manonthemat Aug 28, 2015

Author Contributor

It's fine with me, just makes it easier for people using vim not to include (swap) files that they are working on accidentally. I've seen other editor files in the .gitignore, so I felt it would help. But if it's the standard in the hapijs repositories not to include it, then that's absolutely fine with me. But that may mean that you guys need (more) vim users. ;)

This comment has been minimized.

Copy link
@gergoerdosi

gergoerdosi Aug 28, 2015

Contributor

It is a better practice to use a global .gitignore file for that: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore

This comment has been minimized.

Copy link
@danielb2

danielb2 Aug 28, 2015

I haven't had a .swp file in ages for my vim setup. Most likely because I have this option set set noswapfile

This comment has been minimized.

Copy link
@manonthemat

manonthemat Aug 28, 2015

Author Contributor

thanks for the tip 👍

This comment has been minimized.

Copy link
@danielb2

danielb2 Aug 28, 2015

@manonthemat the default file for the global ignore file is actually $HOME/.config/git/ignore. There's no need to set it to something else as in the link by @gergoerdosi

@cjihrig

This comment has been minimized.

Copy link
Contributor

cjihrig commented Aug 28, 2015

Thanks!

cjihrig added a commit that referenced this pull request Aug 28, 2015
markdown fixes
@cjihrig cjihrig merged commit 40de6a2 into hapijs:master Aug 28, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@cjihrig cjihrig added this to the 1.5.1 milestone Aug 28, 2015
@cjihrig cjihrig self-assigned this Aug 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.