diff options
| author |   John DeNisco <jdenisco@cisco.com> | 2018-08-23 14:04:22 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-08-27 14:18:25 +0000 |
| commit | 2ba9dcf408d5f861738356dfb43c28a803fcd7fc (patch) | |
| tree | 85fd9195081b6e16c6d6cdf8475447181d3d3c1b /docs/gettingstarted/developers/gitreview.rst | |
| parent | 33ed3e4c7d0fa1335642ad45e4e52c7ba15cded6 (diff) | |
docs: Finish event logger, viewer and cleanup.
Change-Id: I3de038439bf0ab5755777c0f4930aec0514f5b63
Signed-off-by: John DeNisco <jdenisco@cisco.com>
Diffstat (limited to 'docs/gettingstarted/developers/gitreview.rst')
| -rw-r--r-- | docs/gettingstarted/developers/gitreview.rst | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/gettingstarted/developers/gitreview.rst b/docs/gettingstarted/developers/gitreview.rst index a9e1b02c764..e32d8c59991 100644 --- a/docs/gettingstarted/developers/gitreview.rst +++ b/docs/gettingstarted/developers/gitreview.rst @@ -54,7 +54,7 @@ Otherwise, clone with: .. code-block:: console - $ git clone ssh://YOUR_GERRIT_USERNAME@gerrit.fd.io:29418/vpp + $ git clone ssh://<YOUR_GERRIT_USERNAME>@gerrit.fd.io:29418/vpp $ cd vpp When attempting to clone the repo Git will prompt you asking if you want to add the Server Host Key to the list of known hosts. Enter **yes** and press the **Enter** key. @@ -78,7 +78,7 @@ Make sure you have modified the correct files by issuing the following commands: $ git diff Then add and commit the patch. You may want to add a tag to the commit comments. -For example for a document with only patches you should add the tag **DOCS:**. +For example for a document with only patches you should add the tag **docs:**. .. code-block:: console @@ -133,7 +133,7 @@ To modify an existing patch, make sure you modified the correct files, and apply $ git commit --amend $ git review -When you're done viewing or modifying a branch, get back to the master branch with: +When you're done viewing or modifying a branch, get back to the master branch by entering: .. code-block:: console @@ -143,10 +143,11 @@ When you're done viewing or modifying a branch, get back to the master branch wi Resolving a Conflict -------------------------------- -If a change has a conflict it should be resolved with the following:git-review -d <Gerrit change #> +If a change has a conflict it should be resolved by entering: .. code-block:: console + $ git-review -d <*Gerrit change #*> $ git rebase origin/master while (conflicts) <fix conflicts> |