Skip to content

Commit 6b4a92b

Browse files
committed
Merge bitcoin/bitcoin#33568: doc: how to update a subtree
a1226bc doc: how to update a subtree (Sjors Provoost) Pull request description: We have instructions on how to verify a subtree update, but not on how to perform one. ACKs for top commit: yuvicc: ACK a1226bc achow101: ACK a1226bc janb84: ACK a1226bc furszy: ACK a1226bc Tree-SHA512: ba3ccc56a9f1c7f461e0db9699612e1fd64b7c72bfd1dae63d4cb830db416871a493820d3a7924c19b6ce353fc20c5fe07578b053dec6ea68273a007cbebc512
2 parents 90b2884 + a1226bc commit 6b4a92b

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

doc/developer-notes.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,19 @@ to check a subtree directory for consistency with its upstream repository.
11191119

11201120
The tool instructions also include a list of the subtrees managed by Bitcoin Core.
11211121

1122+
To fully verify or update a subtree, add it as a remote:
1123+
1124+
```sh
1125+
git remote add libmultiprocess https://github.com/bitcoin-core/libmultiprocess.git
1126+
```
1127+
1128+
To update the subtree:
1129+
1130+
```sh
1131+
git fetch libmultiprocess
1132+
git subtree pull --prefix=src/ipc/libmultiprocess libmultiprocess master --squash
1133+
```
1134+
11221135
The ultimate upstream of the few externally managed subtrees are:
11231136

11241137
- src/leveldb

0 commit comments

Comments
 (0)