Skip to content

Conversation

@PierreRochard
Copy link
Contributor

Addresses #34

@PierreRochard
Copy link
Contributor Author

Just realized OP_CHECKLOCKTIMEVERIFY is not "official" yet - I'll leave this open for comments

@petertodd
Copy link
Owner

Yeah, Bitcoin Core hasn't changed OP_NOP2 to OP_CHECKLOCKTIMEVERIFY yet; inclined to merge this or something like it after the next release of python-bitcoinlib.

Copy link

Choose a reason for hiding this comment

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

Super pedantic, but can you revert the deletion of the newline?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@epheph absolutely, I didn't mean to do that. I'm also not very experienced with git and interested in learning, what would be the best way to revert?

@epheph
Copy link

epheph commented Oct 5, 2015

It isn't really a "revert" in the git sense, since if you did a "git revert" at the head of your branch, it would undo all changes in a brand new commit and you'd have to re-add all the changes you wanted back. I would just do a simple new git commit with the eol added. Curiously, what editor did this?

@petertodd petertodd merged commit fa08435 into petertodd:master Jan 25, 2016
petertodd added a commit that referenced this pull request Jan 25, 2016
fa08435 adding OP_CHECKLOCKTIMEVERIFY (Pierre Rochard)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants