From: Jacob Lifshay <programmerjake@gmail.com>
Date: Wed, 23 Mar 2022 02:57:49 +0000 (-0700)
Subject: fix subtree syncing instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=43d5061cdde5b1ff230def24422193e2bf361c52;p=nmutil.git

fix subtree syncing instructions
---

diff --git a/git_subtree_syncing.mdwn b/git_subtree_syncing.mdwn
index c01c483..34b39e2 100644
--- a/git_subtree_syncing.mdwn
+++ b/git_subtree_syncing.mdwn
@@ -10,7 +10,7 @@ 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
@@ -20,14 +20,12 @@ 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
@@ -36,10 +34,9 @@ git subtree split -P src/nmutil/openpower_sv_bitmanip_in_wiki --rejoin -b openpo
 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:
@@ -47,7 +44,7 @@ git checkout master
 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
@@ -56,8 +53,7 @@ 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
 ```