From c97ed503e0318fcbd2ff3a193bf8cc38af095561 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Tue, 22 Mar 2022 20:06:31 -0700 Subject: [PATCH] add git pull to syncing instructions --- .../git_subtree_syncing.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/nmutil/openpower_sv_bitmanip_in_wiki/git_subtree_syncing.mdwn b/src/nmutil/openpower_sv_bitmanip_in_wiki/git_subtree_syncing.mdwn index 34b39e2..c037d10 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 @@ -14,7 +14,10 @@ Do the initial setup for your local repo (above) first. ```sh cd nmutil +git checkout master +git pull git checkout wiki-master +git pull 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 @@ -29,7 +32,10 @@ Do the initial setup for your local repo (above) first. ```sh cd nmutil +git checkout wiki-master +git pull git checkout master +git pull 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 @@ -48,7 +54,10 @@ Do the initial setup for your local repo (above) first. ```sh cd nmutil +git checkout master +git pull git checkout wiki-master +git pull 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 -- 2.30.2