diff options
Diffstat (limited to 'documentation/dev-manual/dev-manual-newbie.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index c39024cd3f..57079fa0c5 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -246,6 +246,9 @@ | |||
246 | This way if you don’t like what you have done you can easily get rid of the work.</para></listitem> | 246 | This way if you don’t like what you have done you can easily get rid of the work.</para></listitem> |
247 | <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and | 247 | <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and |
248 | tells you which branch in which you are currently working.</para></listitem> | 248 | tells you which branch in which you are currently working.</para></listitem> |
249 | <listitem><para><emphasis><filename>git branch -D <branch-name></filename></emphasis> – | ||
250 | Deletes an existing branch. You need to be in a branch other than the one you are deleting | ||
251 | in order to delete <branch-name>.</para></listitem> | ||
249 | <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git | 252 | <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git |
250 | repository and places it in your local Git repository. | 253 | repository and places it in your local Git repository. |
251 | You use this command to make sure you are synchronized with the upstream repository | 254 | You use this command to make sure you are synchronized with the upstream repository |
@@ -258,7 +261,7 @@ | |||
258 | local branch of your repository with another branch. | 261 | local branch of your repository with another branch. |
259 | When you create a local Git repository the default branch is named “master”. | 262 | When you create a local Git repository the default branch is named “master”. |
260 | A typical workflow is to create a temporary branch for isolated work, make and commit your | 263 | A typical workflow is to create a temporary branch for isolated work, make and commit your |
261 | changes, switch to the master branch, merge the changes in the temporary branch with the | 264 | changes, switch to the master branch, merge the changes from the temporary branch into the |
262 | master branch, and then delete the temporary branch</para></listitem> | 265 | master branch, and then delete the temporary branch</para></listitem> |
263 | <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific | 266 | <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific |
264 | commits from one branch into another branch. | 267 | commits from one branch into another branch. |