See commits for details. Does change the test binary due to JSON strings.
Fix spelling mistakes in code documentation #6544
pull maaku wants to merge 2 commits into bitcoin:master from maaku:spellfix changing 2 files +2 −2-
maaku commented at 1:13 AM on August 11, 2015: contributor
-
Correct a possibly intentional pun that is nevertheless hard to read: "two times of nLockTime." What is meant is that there are two kinds, or categories of nLockTime. e846b2a1e9
-
Fix spelling mistake in -> if. c5c1edfe60
-
Diapolo commented at 7:04 AM on August 11, 2015: none
Should go to https://github.com/theuni/bitcoin/tree/trivial-next
-
dcousens commented at 7:48 AM on August 11, 2015: contributor
@Diapolo what is that repository by comparison? Why can't it be merged here? I don't see any notes RE the above in https://github.com/bitcoin/bitcoin#development-process, so please forgive me if I've missed something.
-
dcousens commented at 8:17 AM on August 11, 2015: contributor
@fanquake sure. I removed the superfluous comment in #6543. There is no mention of that process in the
README, is it listed somewhere officially?Also, if they are legitimate fixes, why not just merge any way? If you want to limit the number of "trivial" commits, why not use a branch [in this repository] and just merge it after some cap of trivial commits has been reached? It seems redundant to use another repository for changes to this code base.
-
fanquake commented at 8:48 AM on August 11, 2015: member
@dcousens The repo is still somewhat experimental. It's had some traffic, and been merged back into the main repository at least three time now, see #6135, #6004 and the original merge in #5731. Given that we're pointing people to it we probably should mention it in the documentation. Feel free to submit a pull request (to the main repo) to add some notes.
Using a separate branch in this repository doesn't solve the "noise" problem. Anyone following this repository would still get emailed for every trivial pull request, and every comment each trivial pull.
-
jonasschnelli commented at 3:32 PM on August 17, 2015: contributor
ACK. But should go over @theuni s trivial branch.
- laanwj merged this on Aug 19, 2015
- laanwj closed this on Aug 19, 2015
- laanwj referenced this in commit ef30389e2a on Aug 19, 2015
- maaku deleted the branch on Jan 6, 2016
- luke-jr referenced this in commit ddbbdabc7a on Jan 9, 2016
- luke-jr referenced this in commit e1c65a5b82 on Jan 9, 2016
- luke-jr referenced this in commit b326b33cd8 on Jan 10, 2016
- luke-jr referenced this in commit c5d0e7ab48 on Jan 10, 2016
- DrahtBot locked this on Sep 8, 2021