Commit graph

82 commits

Author SHA1 Message Date
Byron Hambly
19759fb681 Merge 0dc1002c30 into merged_master (Bitcoin PR bitcoin/bitcoin#24433) 2023-07-02 16:08:36 +00:00
Byron Hambly
4d9da62981 Merge 6cd1e0f341 into merged_master (Bitcoin PR bitcoin/bitcoin#23728) 2023-06-12 12:51:59 +00:00
James Dorfman
3a4b8b4c29 Merge 1260b7e483 into merged_master (Bitcoin PR bitcoin/bitcoin#23001) 2023-04-22 02:33:35 +00:00
Byron Hambly
d5f7102603 Merge 5b6104edf0 into merged_master (Bitcoin PR bitcoin/bitcoin#22746) 2023-04-10 11:20:25 +00:00
MarcoFalke
fa694f61ab
doc: Explain that feedback needs to be addressed 2022-02-24 13:47:47 +01:00
MarcoFalke
fa0819eea3
doc: Move peer-review paragraph to right section 2022-02-23 19:20:06 +01:00
MarcoFalke
fa2b65b358
doc: Add link to release-process.md in CONTRIBUTING.md 2022-02-23 19:18:53 +01:00
Tobin Harding
efde111615 Use the imperative mood in example subject line
The section `Committing Patches` contains an example commit subject line
that violates rule seven of the linked guide to writing commit
logs (Chris Beams famous blog post).

We should practice what we preach, especially in examples :)

Use the imperative mood in example commit message subject line.
2021-12-10 11:49:20 +11:00
Jeremy Rand
9bdda50151
Enable TLS in links in documentation 2021-09-16 22:00:20 +00:00
Suriyaa Rocky Sundararuban
470c6aa280
doc: Update GitHub documentation links 2021-08-19 20:42:26 +02:00
Andrew Poelstra
3bb3c02495 Merge 933c6466c2 into merged_master (Bitcoin PR bitcoin/bitcoin#22109) 2021-07-19 19:25:00 +00:00
Andrew Poelstra
df70b3811a Merge 1e7dd584a5 into merged_master (Bitcoin PR #21263) 2021-06-24 21:14:53 +00:00
MarcoFalke
9999e4c64b
doc: Fix external links (IRC, ...) 2021-05-31 17:27:57 +02:00
MarcoFalke
fa1f3a26a7
doc: Clarify that squashing should happen before review 2021-02-22 09:53:01 +01:00
Andrew Poelstra
f92a3d1ed4 Merge 6ea7348122 into merged_master (Bitcoin PR #19638) 2020-11-27 03:15:08 +00:00
Andrew Poelstra
9eb59dda02 Merge 89fa736783 into merged_master (Bitcoin PR #19494) 2020-11-26 02:32:32 +00:00
Andrew Poelstra
bc28bc22ab Merge c2bcb99c1d into merged_master (Bitcoin PR #19071) 2020-11-26 01:09:08 +00:00
Andrew Poelstra
207e69c339 Merge a8327fd71f into merged_master (Bitcoin PR #19072) 2020-11-26 01:08:55 +00:00
Andrew Poelstra
f49f002e31 Merge 414f6c496d into merged_master (Bitcoin PR #18283) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
9fe64c9a25 Merge 377eed564e into merged_master (Bitcoin PR #18170) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
5d49e7a1d3 Merge b813fbe804 into merged_master (Bitcoin PR #17159) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
fe7b1b8551 Merge 9a4cc52d73 into merged_master (Bitcoin PR #17688) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
03ba036f48 Merge 3e94938072 into merged_master (Bitcoin PR #17772) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
1c54f0daf5 Merge b8f041af2d into merged_master (Bitcoin PR #17157) 2020-11-09 21:20:42 +00:00
Andrew Poelstra
a7947fc922 Merge 215eec3bb5 into merged_master (Bitcoin PR #16723) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
5772766801 Merge 33894612c0 into merged_master (Bitcoin PR #16484) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
b4a7490e22 Merge 2ea8ebd211 into merged_master (Bitcoin PR #16149) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
1ccfa50e73 Merge aebe990dfe into merged_master (Bitcoin PR #15794) 2020-10-29 04:48:36 +00:00
Andrew Poelstra
def14d844b Merge bbc436e09e into merged_master (Bitcoin PR #15626) 2020-10-28 00:09:47 +00:00
Andrew Poelstra
930d90ef15 Merge d67f9d0db9 into merged_master (Bitcoin PR #15577) 2020-10-27 23:49:21 +00:00
Riccardo Masutti
1e72b68ab3 Replace hidden service with onion service
For a couple of years, Tor documentation has made
the term hidden service obsolete, in favor of onion
service.

This PR updates all the references in the code base.
2020-08-07 14:55:02 +02:00
Jon Atack
b03697b68e
doc: CONTRIBUTING.md improvements 2020-07-12 07:52:28 +02:00
MarcoFalke
66666d55b1
doc: Mention repo split in the READMEs 2020-06-08 10:06:14 -04:00
MarcoFalke
facef3d413
doc: Explain that anyone can work on good first issues, move text to CONTRIBUTING.md 2020-05-28 11:59:20 -04:00
MarcoFalke
fae2fb2a19
doc: Expand section on Getting Started
Co-authored-by: Adam Jonas <jonas@chaincode.com>
Co-authored-by: Jon Atack <jon@atack.com>
2020-05-28 11:59:07 -04:00
MarcoFalke
100000d1b2
doc: Add headings to CONTRIBUTING.md
This makes it possible to link and refer to subsections

Also, minor clarifications
2020-05-28 11:58:54 -04:00
Wladimir J. van der Laan
414f6c496d
Merge #18283: doc: Explain rebase policy in CONTRIBUTING.md
fa1244783c doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa1244783c, typos fixed.
  laanwj:
    ACK fa1244783c

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
2020-03-11 16:01:25 +01:00
MarcoFalke
377eed564e
Merge #18170: doc: Minor grammatical changes and flow improvements
7ba962276e doc: Minor grammatical changes and flow improvements (Travin Keith)

Pull request description:

  **Grammar:**

  Line 49: There shouldn't be a period at the end of a phrase.

  Lines 56, 57, 116, 137, and 177: Adding necessary commas

  Lines 103 and 136: Run-on sentence issues fixed.

  Line 176: Fixed punctuation and added necessary conjunction

  Line 178: Singular noun when it should be plural

  **Flow:**

  Line 49: Adding "for" makes it more natural.

  Line 54: Though it's not grammatically incorrect to end a sentence with a preposition in an informal document such as this, the word "followed" is much easier to understand anyway, especially for those who don't have English as their native language.

Top commit has no ACKs.

Tree-SHA512: 17fdb5fc6146e025f160e860dbcbdbfa07b7608b8cb611c3b9d4ed91c426100ef772915251bc1f6bacb3a62df57b72c2003fb72cb2c8542454638545985313da
2020-03-11 10:25:47 -04:00
MarcoFalke
fa1244783c
doc: Explain rebase/squash policy in CONTRIBUTING.md 2020-03-11 07:51:23 -04:00
Travin Keith
7ba962276e
doc: Minor grammatical changes and flow improvements
Grammar:

Line 49: There shouldn't be a period at the end of a phrase.

Lines 56, 57, 116, 137, and 177: Adding necessary commas

Lines 103 and 136: Run-on sentence issues fixed. 

Line 176: Fixed punctuation and added necessary conjunction

Line 178: Singular noun when it should be plural

Flow:

Line 49: Adding "for" makes it more natural. 

Line 54: Though it's not grammatically incorrect to end a sentence with a preposition in an informal document such as this, the word "followed" is much easier to understand anyway, especially for those who don't have English as their native language.
2020-02-18 04:32:35 +01:00
Carnhof Daki
2a6bce482c doc: Add a note about backporting
See laanwj's comment in #17158
https://github.com/bitcoin/bitcoin/pull/17158#issuecomment-542627090

Co-Authored-By: Wladimir J. van der Laan <laanwj@protonmail.com>
Co-Authored-By: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Co-Authored-By: João Barbosa <joao.paulo.barbosa@gmail.com>
Co-Authored-By: Michael <fanquake@gmail.com>
Co-Authored-By: Luke Dashjr <luke-jr+git@utopios.org>
2020-01-06 13:57:13 +01:00
fanquake
9a4cc52d73
Merge #17688: doc: Add "ci" prefix to CONTRIBUTING.md
19267cbc82 doc: Add ci prefix to CONTRIBUTING.md (Hennadii Stepanov)

Pull request description:

  It seems our maintainers like `ci` prefix for commits and PRs:
  ```
  git log | grep 'ci:'
  ```

  and
  ![Screenshot from 2019-12-07 11-49-51](https://user-images.githubusercontent.com/32963518/70372457-ec592a80-18e7-11ea-9320-73412a1ccd25.png)

  So let's document it.

ACKs for top commit:
  fanquake:
    ACK 19267cbc82 - this looks ok

Tree-SHA512: ef467513f9562f51d0471c5cc900336caab4e9494299bcd2c9cc9e1b296536a86467807d71b8d7100a5c78715174cf58b6ecfe6c3bd958060c15eba4fba7067f
2020-01-04 14:28:24 +08:00
Emil Engler
34d826ea5f
doc: Mention PR Club in CONTRIBUTING.md 2019-12-18 17:52:46 +01:00
Hennadii Stepanov
19267cbc82
doc: Add ci prefix to CONTRIBUTING.md 2019-12-15 21:28:56 +02:00
dannmat
f09ba060ca doc: Added instructions for how to add an upsteam to forked repo
As a first time git developer, I struggled to understand whether to create a new fork for each pull request or not.

After asking the IRC chat, I have added this to the documentation to further help new developers using git.

Co-Authored-By: Michael <fanquake@gmail.com>
2019-10-20 11:47:42 +01:00
Hennadii Stepanov
a64dbeffe4
doc: Update labels in CONTRIBUTING.md
Add `build' label.
Make labels lowercase.
Split long labels.
2019-08-26 11:48:58 +03:00
MarcoFalke
faa88d0b5c
doc: update labels in CONTRIBUTING.md 2019-07-29 13:17:05 -04:00
MarcoFalke
fac5ddfc57
doc: Rework section on ACK 2019-06-13 10:08:25 -04:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00