Skip to content

Conversation

@Sjors
Copy link
Member

@Sjors Sjors commented Jun 12, 2020

Running git-subtree-check.sh requires adding the subtree repository as a remote. I learned that several years ago and then forgot again.

This PR also improves the error message if the subtree commit can't be found.

@Sjors Sjors force-pushed the 2020/06/subtree-docs branch from 117f69d to a4a3fc4 Compare June 12, 2020 11:32
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK a4a3fc4 - this looks ok.

@laanwj
Copy link
Member

laanwj commented Jul 9, 2020

ACK a4a3fc4

@laanwj laanwj merged commit fd9db45 into bitcoin:master Jul 9, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 9, 2020
a4a3fc4 doc: improve subtree check instructions (Sjors Provoost)

Pull request description:

  Running `git-subtree-check.sh` requires adding the subtree repository as a remote. I learned that several years ago and then forgot again.

  This PR also improves the error message if the subtree commit can't be found.

ACKs for top commit:
  laanwj:
    ACK a4a3fc4
  fanquake:
    ACK a4a3fc4 - this looks ok.

Tree-SHA512: 959bd923726c172d17f9f97f8a56988bf2df5a94d3131e5152a66150b941394cee9e82fdc6b86e09c0ba91d123a496599f07ca454212168d8d301738394c12c8
@str4d str4d mentioned this pull request Nov 9, 2020
zkbot added a commit to zcash/zcash that referenced this pull request Nov 10, 2020
Lint fixes

Fixes most lints currently reported by `test/lint/lint-all.sh`.

Includes changes cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#8700
- bitcoin/bitcoin#8840
- bitcoin/bitcoin#9867
  - We backported the second commit in #3146
- bitcoin/bitcoin#10771
- bitcoin/bitcoin#11394
- bitcoin/bitcoin#11649
- bitcoin/bitcoin#17329
- bitcoin/bitcoin#19258
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants