Differences

This shows you the differences between two versions of the page.

--- evergreen-docs:github-workflow [2020/08/18 10:53] – aneiman
+++ evergreen-docs:github-workflow [2020/08/18 10:59] – two small tweaks sandbergja
@@ Line 12: / Line 12: @@
     - ''git checkout [BRANCHNAME]''
   - Rebase the pull request branch to master, and handle any conflicts
-    - ''git rebase master'' -- note: if you are planning to squash multiple commits into a single commit, this is a good time to do it by running this command with the ''-i'' flag, i.e. ''git rebase -i master''
+    - ''git rebase master'' -- note: if you are planning to squash multiple commits into a single commit, this is a good time to do it by running this command with the ''-i'' flag, i.e. ''git rebase -i master''.  If you are using ''-i'', git will open your preferred text editor, where you can indicate which commits you'd like to squash.
   - Test build the changed AsciiDoc file + the root*.adoc files that include it
     * ''asciidoc -a icons -a toc -d book -o OUTPUT_FILE ASCIIDOC_FILE''
@@ Line 21: / Line 21: @@
   - Make any corrections (via additional commits, if needed)
   - Use ''git log'' to retrieve commit IDs
-  - Use interactive rebase to add the commits to your local master, adding your sign-off
+  - Add the commits to your local master, adding your sign-off
     - ''git checkout master''
-    - ''git cherry-pick [commit ID]''
+    - ''git cherry-pick -s [commit ID]''
       * Include the relevant Launchpad bug number somewhere in the commit message
         * Example: "Resolves LP#1234567"