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

document 'ordinal' built-in permalink style #3532

Merged
merged 1 commit into from Mar 2, 2015

Conversation

Projects
None yet
3 participants
@willnorris
Contributor

willnorris commented Mar 2, 2015

ordinal was actually added back in April 2013 in ea75313

document 'ordinal' built-in permalink style
ordinal was actually added back in April 2013 in ea75313
@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 2, 2015

Member

:shipit:

(use byparker.com/go/merge-pr to merge, if you do)

Member

parkr commented Mar 2, 2015

:shipit:

(use byparker.com/go/merge-pr to merge, if you do)

@willnorris

This comment has been minimized.

Show comment
Hide comment
@willnorris

willnorris Mar 2, 2015

Contributor

(okay, setting up merge-pr now)

Contributor

willnorris commented Mar 2, 2015

(okay, setting up merge-pr now)

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 2, 2015

Member

(then run bundle exec rake site:publish to push it all up)

Member

parkr commented Mar 2, 2015

(then run bundle exec rake site:publish to push it all up)

willnorris added a commit that referenced this pull request Mar 2, 2015

Merge pull request #3532 from willnorris/ordinal_docs
document 'ordinal' built-in permalink style

@willnorris willnorris merged commit bc2b87c into jekyll:master Mar 2, 2015

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

willnorris added a commit that referenced this pull request Mar 2, 2015

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 2, 2015

Member

thanks!

Member

parkr commented Mar 2, 2015

thanks!

@willnorris

This comment has been minimized.

Show comment
Hide comment
@willnorris

willnorris Mar 2, 2015

Contributor

sweet!

I also realized that merge-pr expects you to be on the master branch locally when you run it. I was still in the feature branch, which resulted in the error: fatal: The current branch ordinal_docs has no upstream branch.. I just had to push that one commit manually... no big deal.

Contributor

willnorris commented Mar 2, 2015

sweet!

I also realized that merge-pr expects you to be on the master branch locally when you run it. I was still in the feature branch, which resulted in the error: fatal: The current branch ordinal_docs has no upstream branch.. I just had to push that one commit manually... no big deal.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 2, 2015

Member

hmmm yeah, it should probably fail if you're not on master or whatever github-default you've set. go get assumes master, so I could roll with that convention until it changes (if it changes).

Member

parkr commented Mar 2, 2015

hmmm yeah, it should probably fail if you're not on master or whatever github-default you've set. go get assumes master, so I could roll with that convention until it changes (if it changes).

@parkr parkr referenced this pull request Mar 2, 2015

Closed

Ensure on master branch #14

@willnorris willnorris deleted the willnorris:ordinal_docs branch Mar 2, 2015

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