diff --git a/development.md b/development.md index 4d6bd88b95..c0ac589c90 100644 --- a/development.md +++ b/development.md @@ -193,13 +193,14 @@ git checkout -b ~~~ Then, make your changes and commit as you go. You'll build up a branch off of master with a series of commits. Once you are -done, pull the latest from master again and rebase your changes on top. +done, pull the latest from master again, rebase your changes on top, and update the submodule pointers that SPDK relies on. ~~~{.sh} git checkout master git pull git checkout git rebase -i master +git submodule update ~~~ Now your branch should be based on the tip of master and you should have the tip of checked out. You can push @@ -403,7 +404,7 @@ git push review ~~~ Gerrit will create three reviews, each dependent on one another. Inevitably, a reviewer will ask you to make a change during -code review on change #2. To address that feedback, you could do the following: +code review on change #2. To address that feedback, you should do the following: ~~~{.sh} git checkout @@ -412,6 +413,7 @@ git checkout -b tmp # 'tmp' or any name you want git commit -s -a --amend # The amend modifies change #2 to include your updates git checkout # Points at change #3 git rebase -i tmp # Move change #3 on top of the new change #2 +git submodule update git push review git branch -D tmp # Clean up the 'tmp' branch ~~~