summaryrefslogtreecommitdiff
path: root/doc/source/dev/gitwash
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source/dev/gitwash')
-rw-r--r--doc/source/dev/gitwash/configure_git.rst6
-rw-r--r--doc/source/dev/gitwash/development_workflow.rst8
-rw-r--r--doc/source/dev/gitwash/git_development.rst1
-rw-r--r--doc/source/dev/gitwash/git_resources.rst4
-rw-r--r--doc/source/dev/gitwash/index.rst2
5 files changed, 9 insertions, 12 deletions
diff --git a/doc/source/dev/gitwash/configure_git.rst b/doc/source/dev/gitwash/configure_git.rst
index 7e8cf8cbd..c62f33671 100644
--- a/doc/source/dev/gitwash/configure_git.rst
+++ b/doc/source/dev/gitwash/configure_git.rst
@@ -16,7 +16,7 @@ Here is an example ``.gitconfig`` file::
[user]
name = Your Name
email = you@yourdomain.example.com
-
+
[alias]
ci = commit -a
co = checkout
@@ -24,7 +24,7 @@ Here is an example ``.gitconfig`` file::
stat = status -a
br = branch
wdiff = diff --color-words
-
+
[core]
editor = vim
@@ -33,7 +33,7 @@ Here is an example ``.gitconfig`` file::
You can edit this file directly or you can use the ``git config --global``
command::
-
+
git config --global user.name "Your Name"
git config --global user.email you@yourdomain.example.com
git config --global alias.ci "commit -a"
diff --git a/doc/source/dev/gitwash/development_workflow.rst b/doc/source/dev/gitwash/development_workflow.rst
index 8606b9018..523e04c0a 100644
--- a/doc/source/dev/gitwash/development_workflow.rst
+++ b/doc/source/dev/gitwash/development_workflow.rst
@@ -16,7 +16,7 @@ Basic workflow
In short:
-1. Update your ``master`` branch if it's not up to date.
+1. Update your ``master`` branch if it's not up to date.
Then start a new *feature branch* for each set of edits that you do.
See :ref:`below <making-a-new-feature-branch>`.
@@ -100,7 +100,7 @@ In git >= 1.7 you can ensure that the link is correctly set by using the
``--set-upstream`` option::
git push --set-upstream origin my-new-feature
-
+
From now on git_ will know that ``my-new-feature`` is related to the
``my-new-feature`` branch in your own github_ repo.
@@ -144,7 +144,7 @@ In more detail
#. Check what the actual changes are with ``git diff`` (`git diff`_).
#. Add any new files to version control ``git add new_file_name`` (see
- `git add`_).
+ `git add`_).
#. To commit all modified files into the local copy of your repo,, do
``git commit -am 'A commit message'``. Note the ``-am`` options to
``commit``. The ``m`` flag just signals that you're going to type a
@@ -155,7 +155,7 @@ In more detail
`tangled working copy problem`_. The section on
:ref:`commit messages <writing-the-commit-message>` below might also be useful.
#. To push the changes up to your forked repo on github_, do a ``git
- push`` (see `git push`).
+ push`` (see `git push`).
.. _writing-the-commit-message:
diff --git a/doc/source/dev/gitwash/git_development.rst b/doc/source/dev/gitwash/git_development.rst
index fb997abec..ee7787fec 100644
--- a/doc/source/dev/gitwash/git_development.rst
+++ b/doc/source/dev/gitwash/git_development.rst
@@ -12,4 +12,3 @@ Contents:
development_setup
configure_git
development_workflow
-
diff --git a/doc/source/dev/gitwash/git_resources.rst b/doc/source/dev/gitwash/git_resources.rst
index ae350806e..5f0c1d020 100644
--- a/doc/source/dev/gitwash/git_resources.rst
+++ b/doc/source/dev/gitwash/git_resources.rst
@@ -9,9 +9,9 @@ Tutorials and summaries
* `github help`_ has an excellent series of how-to guides.
* `learn.github`_ has an excellent series of tutorials
-* The `pro git book`_ is a good in-depth book on git.
+* The `pro git book`_ is a good in-depth book on git.
* A `git cheat sheet`_ is a page giving summaries of common commands.
-* The `git user manual`_
+* The `git user manual`_
* The `git tutorial`_
* The `git community book`_
* `git ready`_ - a nice series of tutorials
diff --git a/doc/source/dev/gitwash/index.rst b/doc/source/dev/gitwash/index.rst
index f3038721e..9d733dd1c 100644
--- a/doc/source/dev/gitwash/index.rst
+++ b/doc/source/dev/gitwash/index.rst
@@ -12,5 +12,3 @@ Contents:
following_latest
git_development
git_resources
-
-