diff --git a/doc/backporting.md b/doc/backporting.md --- a/doc/backporting.md +++ b/doc/backporting.md @@ -1,17 +1,17 @@ BACKPORTING =========== -The official Bitcoin-ABC guide to backporting code from Bitcoin Core. When searching +The official Bitcoin ABC guide to backporting code from Bitcoin Core. When searching for items to backport, especially be on the lookout for bug fixes, code cleanup, and important refactors, as these help improve Bitcoin ABC despite consensus-level differences -between Bitcoin Cash and Bitcoin Core. +between eCash and Bitcoin Core. Identifying commits ------------------- 1. Check out a copy of a Satoshi Bitcoin client somewhere on your machine. 2. Identify the subsystem you'd like to work on. -3. Tag the fork commit as `fork-commit`. Bitcoin-ABC was forked from Bitcoin Core +3. Tag the fork commit as `fork-commit`. Bitcoin ABC was forked from Bitcoin Core at commit `964a185cc83af34587194a6ecda3ed9cf6b49263`. `> git tag -a fork-commit 964a185 -m 'Where the fun started'` 4. `git log --topo-order --graph fork-commit..HEAD -- ` @@ -46,7 +46,7 @@ Backporting ----------- -Before you begin backporting commits, you will need to add an additional remote to your Bitcoin-ABC repo. +Before you begin backporting commits, you will need to add an additional remote to your Bitcoin ABC repo. For Bitcoin Core, this repository would be added as: ```