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

Standardized all text files on markdown and set all their extensions to ... #1267

Merged
merged 1 commit into from Jul 8, 2013

Conversation

Projects
None yet
4 participants
@jpiasetz
Contributor

jpiasetz commented Jul 5, 2013

Standardized all text files on markdown and set all their extensions to the short form.

@parkr

This comment has been minimized.

Member

parkr commented Jul 5, 2013

Looks like it can't be merged here. And I way prefer .markdown over .md so I'm going to leave them that way :)

@jpiasetz

This comment has been minimized.

Contributor

jpiasetz commented Jul 6, 2013

Looks like it can't be merged here.

@parkr Was wondering about that. Is it because it uses git mv?

And I way prefer .markdown over .md so I'm going to leave them that way :)

Changed. There was one each way so I picked the shorter one.

@parkr

This comment has been minimized.

Member

parkr commented Jul 6, 2013

git mv should work - it's still just a patch. Is your Text-files branch up to date with our master? Try:

$ git checkout master
$ git remote add upstream git://github.com/mojombo/jekyll.git
$ git pull upstream master
$ git checkout -b text-files-2
$ # make edits again
$ git push origin text-files-2
# submit new PR

That should bring you up to speed :)

@jpiasetz

This comment has been minimized.

Contributor

jpiasetz commented Jul 6, 2013

Doh. I did a git rebase upstream/master so hopefully mergable now.

@mattr-

This comment has been minimized.

Member

mattr- commented Jul 8, 2013

I know I'm failing to understand something here. I just don't understand the reason behind making this change. Would you mind explaining your reasoning?

@jpiasetz

This comment has been minimized.

Contributor

jpiasetz commented Jul 8, 2013

Consistency, I thought it was strange to have the README in textile and the CONTRIBUTING in markdown. It's one less context switch to deal with if they are the same. Same thing with the different extension, just think it makes it look more cohesive.

I initially suggested the .md extension because that's what github suggests when you make a new repo but don't feel strongly about it either way.

@mattr-

This comment has been minimized.

Member

mattr- commented Jul 8, 2013

I switch between Textile and Markdown fairly easily, so I never thought of
it from that point of view.

Thanks so much for explaining that! ❤️

On Mon, Jul 8, 2013 at 11:56 AM, John Piasetzki notifications@github.comwrote:

Consistency, I thought it was strange to have the README in textile and
the CONTRIBUTING in markdown. It's one less context switch to deal with if
they are the same. Same thing with the different extension, just think it
makes it look more cohesive.

I initially suggested the .md extension because that's what github
suggests when you make a new repo but don't feel strongly about it either
way.


Reply to this email directly or view it on GitHubhttps://github.com//pull/1267#issuecomment-20619745
.

@mattr-

This comment has been minimized.

Member

mattr- commented Jul 8, 2013

👍 from me. @parkr?

@parkr

This comment has been minimized.

Member

parkr commented Jul 8, 2013

👍 :shipit:

parkr added a commit that referenced this pull request Jul 8, 2013

Merge pull request #1267 from jpiasetz/Text-files
Standardized all text files on markdown and set all their extensions to ...

@parkr parkr merged commit 1286d98 into jekyll:master Jul 8, 2013

1 check passed

default The Travis CI build passed
Details

parkr added a commit that referenced this pull request Jul 8, 2013

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.