From: Jacob Lifshay <programmerjake@gmail.com>
Date: Wed, 23 Mar 2022 03:04:15 +0000 (-0700)
Subject: Merge commit '43d5061cdde5b1ff230def24422193e2bf361c52'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae9d0b0f25c611fb7ee89dee24affdd2a38ad12c;p=nmutil.git

Merge commit '43d5061cdde5b1ff230def24422193e2bf361c52'
---

ae9d0b0f25c611fb7ee89dee24affdd2a38ad12c
diff --cc src/nmutil/openpower_sv_bitmanip_in_wiki/git_subtree_syncing.mdwn
index c01c483,0000000..34b39e2
mode 100644,000000..100644
--- a/src/nmutil/openpower_sv_bitmanip_in_wiki/git_subtree_syncing.mdwn
+++ b/src/nmutil/openpower_sv_bitmanip_in_wiki/git_subtree_syncing.mdwn
@@@ -1,63 -1,0 +1,59 @@@
 +This folder is synchronized between nmutil.git and libreriscv.git (the wiki) using `git subtree`.
 +
 +# Initial setup for your local repo:
 +```sh
 +cd nmutil
 +git remote add -f wiki ssh://gitolite3@git.libre-soc.org:922/libreriscv.git
 +git checkout -b wiki-master wiki/master
 +git checkout master
 +```
 +
 +# Copying latest changes from libreriscv.git to nmutil.git:
 +
- Do the initial setup for your local repo first.
++Do the initial setup for your local repo (above) first.
 +
 +```sh
 +cd nmutil
 +git checkout wiki-master
 +git subtree split -P openpower/sv/bitmanip --rejoin -b openpower-sv-bitmanip
 +git checkout master
 +git subtree merge -P src/nmutil/openpower_sv_bitmanip_in_wiki openpower-sv-bitmanip
 +git branch -d openpower-sv-bitmanip
 +git push
- git checkout wiki-master
- git push
- git checkout master
++git push wiki wiki-master:master
 +```
 +
 +# Copying latest changes from nmutil.git to libreriscv.git:
 +
- Do the initial setup for your local repo first.
++Do the initial setup for your local repo (above) first.
 +
 +```sh
 +cd nmutil
 +git checkout master
 +git subtree split -P src/nmutil/openpower_sv_bitmanip_in_wiki --rejoin -b openpower-sv-bitmanip
 +git checkout wiki-master
 +git subtree merge -P openpower/sv/bitmanip openpower-sv-bitmanip
 +git branch -d openpower-sv-bitmanip
- git push
- git checkout wiki-master
- git push
 +git checkout master
++git push
++git push wiki wiki-master:master
 +```
 +
 +# Initial setup for repos:
 +
 +This was already done for this folder, you don't need to do it.
 +This is here merely for future reference in case anyone wants to reproduce our setup.
 +
- Do the initial setup for your local repo first.
++Do the initial setup for your local repo (above) first.
 +
 +```sh
 +cd nmutil
 +git checkout wiki-master
 +git subtree split -P openpower/sv/bitmanip --rejoin -b openpower-sv-bitmanip
 +git checkout master
 +git subtree add -P src/nmutil/openpower_sv_bitmanip_in_wiki openpower-sv-bitmanip
 +git branch -d openpower-sv-bitmanip
- git push
- git checkout wiki-master
- git push
 +git checkout master
++git push
++git push wiki wiki-master:master
 +```