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.

Sign up for GitHub

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

Jump to bottom

doc: add github-merge.py documentation #29

Merged
merged 1 commit into from
Aug 19, 2019
Merged

doc: add github-merge.py documentation #29

merged 1 commit into from
Aug 19, 2019

Conversation

fanquake
Copy link
Member

This has been ported from the bitcoin/bitcoin repo, with some small changes to make it more general.

@fanquake fanquake mentioned this pull request Aug 16, 2019
Merged
@fanquake
Copy link
Member Author

@real-or-random or @jonasnick, either of you might be interested in looking over this as part of getting setup with the secp256k1 repo?

real-or-random
real-or-random reviewed Aug 17, 2019
View reviewed changes
Copy link
Contributor

@real-or-random real-or-random left a comment

Choose a reason for hiding this comment

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

Looks good. I added a suggestion (took me 20 min to figure that out...).

README.md Show resolved Hide resolved
jonasnick
jonasnick approved these changes Aug 18, 2019
View reviewed changes
Copy link

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

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

ACK 686d2f1 worked for me (fort-nix/nix-bitcoin@08067a6)

@fanquake
doc: add github-merge.py documentation
806dca1 
This has been ported from the bitcoin/bitcoin repo, with some
small changes to make it more general.
laanwj added a commit that referenced this pull request Aug 19, 2019
@laanwj
Merge #29: doc: add github-merge.py documentation
bfda7f3 
806dca1 doc: add github-merge.py documentation (fanquake)

Pull request description:

  This has been ported from the bitcoin/bitcoin repo, with some small changes to make it more general.

Top commit has no ACKs.

Tree-SHA512: 8504fc1acb256af70c5726dc0298626c37b97065b55091bbddfb655348ba7d238fe11dc167fc40b83068cd73ad60da83adbfb6c2f484194039230b4f27d4375d
@laanwj laanwj merged commit 806dca1 into bitcoin-core:master Aug 19, 2019
@fanquake fanquake deleted the github-merge-docs branch August 19, 2019 11:03
laanwj added a commit to bitcoin/bitcoin that referenced this pull request Aug 19, 2019
@laanwj
Merge #16625: scripts: remove github-merge.py
c79bf32 
6c27fa0 scripts: remove github-merge.py (fanquake)

Pull request description:

  This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
  after discussion in a core dev meeting. The rationale being that it is also useful to
  other projects, and thus should be moved to a more general repository.

  Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
  See also: bitcoin-core/bitcoin-maintainer-tools#28

  ~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~
  Ported the docs in bitcoin-core/bitcoin-maintainer-tools#29

ACKs for top commit:
  laanwj:
    ACK 6c27fa0

Tree-SHA512: 972070c6893043aebe3b62118d2e42d857553202b1eeb9abca55326f580f25e9859de188a1d0c50b9c7d20bdeeddffc00bcf9ad5a76b60add5c8541956d45489
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 19, 2019
@laanwj @sidhujag
Merge bitcoin#16625: scripts: remove github-merge.py
e23abc7 
6c27fa0 scripts: remove github-merge.py (fanquake)

Pull request description:

  This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
  after discussion in a core dev meeting. The rationale being that it is also useful to
  other projects, and thus should be moved to a more general repository.

  Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
  See also: bitcoin-core/bitcoin-maintainer-tools#28

  ~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~
  Ported the docs in bitcoin-core/bitcoin-maintainer-tools#29

ACKs for top commit:
  laanwj:
    ACK 6c27fa0

Tree-SHA512: 972070c6893043aebe3b62118d2e42d857553202b1eeb9abca55326f580f25e9859de188a1d0c50b9c7d20bdeeddffc00bcf9ad5a76b60add5c8541956d45489
ShengguangXiao pushed a commit to DeFiCh/ain that referenced this pull request Aug 28, 2020
@laanwj
Merge #16625: scripts: remove github-merge.py
d00084f 
199874a scripts: remove github-merge.py (fanquake)

Pull request description:

  This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
  after discussion in a core dev meeting. The rationale being that it is also useful to
  other projects, and thus should be moved to a more general repository.

  Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
  See also: bitcoin-core/bitcoin-maintainer-tools#28

  ~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~
  Ported the docs in bitcoin-core/bitcoin-maintainer-tools#29

ACKs for top commit:
  laanwj:
    ACK 199874a

Tree-SHA512: 972070c6893043aebe3b62118d2e42d857553202b1eeb9abca55326f580f25e9859de188a1d0c50b9c7d20bdeeddffc00bcf9ad5a76b60add5c8541956d45489
knst pushed a commit to knst/dash that referenced this pull request Mar 27, 2024
@laanwj @knst
Merge bitcoin#16625: scripts: remove github-merge.py
9e20918 
6c27fa0 scripts: remove github-merge.py (fanquake)

Pull request description:

  This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
  after discussion in a core dev meeting. The rationale being that it is also useful to
  other projects, and thus should be moved to a more general repository.

  Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
  See also: bitcoin-core/bitcoin-maintainer-tools#28

  ~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~
  Ported the docs in bitcoin-core/bitcoin-maintainer-tools#29

ACKs for top commit:
  laanwj:
    ACK 6c27fa0

Tree-SHA512: 972070c6893043aebe3b62118d2e42d857553202b1eeb9abca55326f580f25e9859de188a1d0c50b9c7d20bdeeddffc00bcf9ad5a76b60add5c8541956d45489
knst pushed a commit to knst/dash that referenced this pull request Mar 27, 2024
@laanwj @knst
Merge bitcoin#16625: scripts: remove github-merge.py
cce5f6a 
6c27fa0 scripts: remove github-merge.py (fanquake)

Pull request description:

  This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
  after discussion in a core dev meeting. The rationale being that it is also useful to
  other projects, and thus should be moved to a more general repository.

  Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
  See also: bitcoin-core/bitcoin-maintainer-tools#28

  ~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~
  Ported the docs in bitcoin-core/bitcoin-maintainer-tools#29

ACKs for top commit:
  laanwj:
    ACK 6c27fa0

Tree-SHA512: 972070c6893043aebe3b62118d2e42d857553202b1eeb9abca55326f580f25e9859de188a1d0c50b9c7d20bdeeddffc00bcf9ad5a76b60add5c8541956d45489
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@real-or-random real-or-random real-or-random left review comments

@jonasnick jonasnick jonasnick approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fanquake @real-or-random @jonasnick @laanwj