Remove $ sign from gitbootcamp. (GH-297)

* Remove $ sign from gitbootcamp.
* Add code-block directives where needed.

Author: Mariatta

gitbootcamp.rst

@@ -32,12 +32,12 @@ Cloning The Forked CPython Repository
 
 You'll only need to do this once.  From your command line::
 
-   $ git clone [email protected]:<username>/cpython.git
+   git clone [email protected]:<username>/cpython.git
 
 It is also recommended to configure an ``upstream`` remote::
 
-   $ cd cpython
-   $ git remote add upstream [email protected]:python/cpython.git
+   cd cpython
+   git remote add upstream [email protected]:python/cpython.git
 
 You can also use SSH-based or HTTPS-based URLs.
 
@@ -46,7 +46,7 @@ Listing the Remote Repositories
 
 To list the remote repositories that are configured, along with their URLs::
 
-   $ git remote -v
+   git remote -v
 
 You should have two remotes: ``origin`` pointing to your fork,
 and ``upstream`` pointing to the official CPython repository::
@@ -61,10 +61,11 @@ and ``upstream`` pointing to the official CPython repository::
 
 Setting Up Your Name and Email Address
 --------------------------------------
-::
 
-   $ git config --global user.name "Your Name"
-   $ git config --global user.email [email protected]
+.. code-block:: bash
+
+   git config --global user.name "Your Name"
+   git config --global user.email [email protected]
 
 The ``--global`` flag sets these globally,
 ``--local`` sets them only for the current project.
@@ -78,7 +79,7 @@ The *autocrlf* option will fix automatically any Windows-specific line endings.
 This should be enabled on Windows, since the public repository has a hook which
 will reject all changesets having the wrong line endings::
 
-    $ git config --global core.autocrlf input
+    git config --global core.autocrlf input
 
 Creating and Switching Branches
 -------------------------------
@@ -89,34 +90,34 @@ Creating and Switching Branches
 Create a new branch and switch to it::
 
    # creates a new branch off master and switch to it
-   $ git checkout -b <branch-name> master
+   git checkout -b <branch-name> master
 
 This is equivalent to::
 
    # create a new branch off 'master', without checking it out
-   $ git branch <branch-name> master
+   git branch <branch-name> master
    # check out the branch
-   $ git checkout <branch-name>
+   git checkout <branch-name>
 
 To find the branch you are currently on::
 
-   $ git branch
+   git branch
 
 The current branch will have an asterisk next to the branch name.  Note, this
 will only list all of your local branches.
 
 To list all the branches, including the remote branches::
 
-   $ git branch -a
+   git branch -a
 
 To switch to a different branch::
 
-   $ git checkout <another-branch-name>
+   git checkout <another-branch-name>
 
 Other releases are just branches in the repository.  For example, to work
 on the 2.7 release::
 
-   $ git checkout -b 2.7 origin/2.7
+   git checkout -b 2.7 origin/2.7
 
 
 .. _deleting_branches:
@@ -126,12 +127,12 @@ Deleting Branches
 
 To delete a **local** branch that you no longer need::
 
-   $ git checkout master
-   $ git branch -D <branch-name>
+   git checkout master
+   git branch -D <branch-name>
 
 To delete a **remote** branch::
 
-   $ git push origin -d <branch-name>
+   git push origin -d <branch-name>
 
 You may specify more than one branch for deletion.
 
@@ -141,40 +142,42 @@ Staging and Committing Files
 
 1. To show the current changes::
 
-      $ git status
+      git status
 
 2. To stage the files to be included in your commit::
 
-      $ git add path/to/file1 path/to/file2 path/to/file3
+      git add path/to/file1 path/to/file2 path/to/file3
 
-3. To commit the files that have been staged (done in step 2)::
+3. To commit the files that have been staged (done in step 2):
 
-      $ git commit -m "bpo-XXXX: This is the commit message."
+   .. code-block:: bash
+
+      git commit -m "bpo-XXXX: This is the commit message."
 
 
 Reverting Changes
 -----------------
 
 To revert changes to a file that has not been committed yet::
 
-   $ git checkout path/to/file
+   git checkout path/to/file
 
 If the change has been committed, and now you want to reset it to whatever
 the origin is at::
 
-   $ git reset --hard HEAD
+   git reset --hard HEAD
 
 
 Stashing Changes
 ----------------
 
 To stash away changes that are not ready to be committed yet::
 
-   $ git stash
+   git stash
 
 To re-apply the last stashed change::
 
-   $ git stash pop
+   git stash pop
 
 .. _commit-changes:
 
@@ -183,11 +186,13 @@ Committing Changes
 
 Add the files you want to commit::
 
-   $ git add <filename>
+   git add <filename>
+
+Commit the files:
 
-Commit the files::
+.. code-block:: bash
 
-   $ git commit -m '<message>'
+   git commit -m '<message>'
 
 
 .. _push-changes:
@@ -200,8 +205,8 @@ them to the remote repository.
 
 ::
 
-   $ git checkout <branch-name>
-   $ git push origin <branch-name>
+   git checkout <branch-name>
+   git push origin <branch-name>
 
 
 Creating a Pull Request
@@ -235,9 +240,9 @@ Scenario:
 
 Solution::
 
-   $ git checkout master
-   $ git pull --rebase upstream master
-   $ git push origin master
+   git checkout master
+   git pull --rebase upstream master
+   git push origin master
 
 The ``--rebase`` option is only needed if you have local changes to the
 branch.
@@ -252,10 +257,10 @@ Another scenario:
 
 Solution::
 
-   $ git checkout some-branch
-   $ git fetch upstream
-   $ git rebase upstream/master
-   $ git push --force origin some-branch
+   git checkout some-branch
+   git fetch upstream
+   git rebase upstream/master
+   git push --force origin some-branch
 
 
 .. _git_from_mercurial:
@@ -273,13 +278,15 @@ Solution:
 
 2. Apply the patch::
 
-       $ git apply /path/to/issueNNNN-git.patch
+       git apply /path/to/issueNNNN-git.patch
 
    If there are errors, update to a revision from when the patch was
-   created and then try the ``git apply`` again::
+   created and then try the ``git apply`` again:
 
-       $ git checkout `git rev-list -n 1 --before="yyyy-mm-dd hh:mm:ss" master`
-       $ git apply /path/to/issueNNNN-git.patch
+   .. code-block:: bash
+
+       git checkout `git rev-list -n 1 --before="yyyy-mm-dd hh:mm:ss" master`
+       git apply /path/to/issueNNNN-git.patch
 
    If the patch still won't apply, then a patch tool will not be able to
    apply the patch and it will need to be re-implemented manually.
@@ -291,8 +298,8 @@ Solution:
 5. If the patch was applied to an old revision, it needs to be updated and
    merge conflicts need to be resolved::
 
-       $ git rebase master
-       $ git mergetool
+       git rebase master
+       git mergetool
 
 6. Push the changes and open a pull request.
 
@@ -312,14 +319,16 @@ On Unix and MacOS, set up the following git alias::
 
    $ git config --global alias.pr '!sh -c "git fetch upstream pull/${1}/head:pr_${1} && git checkout pr_${1}" -'
 
-On Windows, reverse the single (`'`) and double (`"`) quotes::
+On Windows, reverse the single (`'`) and double (`"`) quotes:
+
+.. code-block:: bash
 
    git config --global alias.pr "!sh -c 'git fetch upstream pull/${1}/head:pr_${1} && git checkout pr_${1}' -"
 
 The alias only needs to be done once.  After the alias is set up, you can get a
 local copy of a pull request as follows::
 
-   $ git pr <pr_number>
+   git pr <pr_number>
 
 
 .. _accepting-and-merging-a-pr:
@@ -378,10 +387,12 @@ page.  Find the event that says something like::
 By following the link to ``<commit_sha1>``, you will get the full commit hash.
 
 Alternatively, the commit hash can also be obtained by the following git
-commands::
+commands:
 
-   $ git fetch upstream
-   $ git rev-parse ":/bpo-12345"
+.. code-block:: bash
+
+   git fetch upstream
+   git rev-parse ":/bpo-12345"
 
 The above commands will print out the hash of the commit containing
 ``"bpo-12345"`` as part of the commit message.
@@ -425,21 +436,23 @@ To edit an open pull request that targets ``master``:
 
 2. Fetch the pull request, using the :ref:`git pr <git_pr>` alias::
 
-      $ git pr <pr_number>
+      git pr <pr_number>
 
    This will checkout the contributor's branch at ``pr_XXX``.
 
 3. Make and commit your changes on the branch.  For example, merge in changes
    made to ``master`` since the PR was submitted (any merge commits will be
-   removed by the later ``Squash and Merge`` when accepting the change)::
+   removed by the later ``Squash and Merge`` when accepting the change):
+
+   .. code-block:: bash
 
-      $ git fetch upstream
-      $ git merge upstream/master
-      $ git add <filename>
-      $ git commit -m "<commit message>"
+      git fetch upstream
+      git merge upstream/master
+      git add <filename>
+      git commit -m "<commit message>"
 
 4. Push the changes back to the contributor's PR branch::
 
-      $ git push [email protected]:<contributor>/cpython <pr_XXX>:<branch_name>
+      git push [email protected]:<contributor>/cpython <pr_XXX>:<branch_name>
 
 5. Optionally, :ref:`delete the PR branch <deleting_branches>`.