More refinement of git stuff

* Put guide on git rebasing inline in the reference
* Link to the reference from the section on git in the development process

guide/development_process.rst

@@ -63,6 +63,9 @@ For projects using Git and GitHub, the process can be explained in more detail:
 
 .. seealso::
 
+   :doc:`/reference/git_github`
+      A set of best practices for using Git on the A-team.
+
    :doc:`/reference/glossary`
       A glossary of specialized terms used within the A-Team, including some
       abbreviations used for code review, such as ``r?``, ``r+``, and ``r-``.

reference/git_github.rst

@@ -29,6 +29,11 @@ repository. Typically you rebase a branch to:
 - Move a branch to be based on the latest commit of the branch you want to
   merge into and resolve any conflicts that occur.
 
+If you're not familiar with rebasing, you can start with this `short
+guide`_ on how to use the ``git rebase`` command.
+
+.. _short guide: https://help.github.com/articles/using-git-rebase
+
 These changes all make the code review process as well as the merging process
 easier, and are recommended for all pull requests.
 
@@ -38,11 +43,6 @@ easier, and are recommended for all pull requests.
              sure no one else is using, such as feature branches on your
              personal fork.
 
-.. seealso::
-
-   `Using Git rebase <https://help.github.com/articles/using-git-rebase>`_
-      A short guide on how to use the ``git rebase`` command.
-
 Owners and the Mozilla GitHub Organization
 ------------------------------------------
 See the `GitHub page on wiki.mozilla.org <https://wiki.mozilla.org/Github>`_