Added gitwash documentation after using the gitwash_dumper script to search and replace gitwash => nitime

Author: arokem

INSTALL

@@ -1,89 +1 @@
-.. -*- rst -*- rest mode for emacs
-
-========================
- Development quickstart
-========================
-
-Source Code
-===========
-
-NIPY uses launchpad_ for our code hosting.  For immediate access to
-the source code, see the `nipy launchpad`_ site.
-
-Guidelines
-==========
-
-We have adopted many developer guidelines in an effort to make
-development easy, and the source code readable, consistent and robust.
-Many of our guidelines are adopted from the scipy_ / numpy_ community.
-We welcome new developers to the effort, if you're interested in
-developing code or documentation please join the `nipy mailing list`_
-and introduce yourself.  If you plan to do any code development, we
-ask that you take a look at the following guidelines.  We do our best
-to follow these guidelines ourselves:
-
-* :ref:`howto_document` : Documentation is critical.  This document
-  describes the documentation style, syntax, and tools we use.
-
-* `Numpy/Scipy Coding Style Guidelines:
-  <http://projects.scipy.org/scipy/numpy/wiki/CodingStyleGuidelines>`_
-  This is the coding style we strive to maintain.
-
-* :ref:`bzr_workflow` : This describes our process for version control.
-
-* :ref:`testing` : We've adopted a rigorous testing framework.
-
-* :ref:`optimization`: "premature optimization is the root of all
-  evil."
-
-.. _trunk_download:
-
-Checking out the latest version
-===============================
-
-To check out the latest version of nipy you need bzr version greater than
-0.92::
-
-    bzr branch lp:nipy
-
-There are two methods to install a development version of nipy.  For
-both methods, build the extensions in place::
-
-    python setup.py build_ext --inplace
-
-Then you can either:
-
-#. Use the ``mynipy`` script in the tools directory of the nipy
-   source.  There are directions and examples in the docstring of that
-   file, but basically it updates a symbolic link in your
-   *site-packages* directory to the inplace build of your source.  The
-   advantage of this method is it does not require any modifications of
-   your PYTHONPATH.
-
-#. Place the source directory in your PYTHONPATH.
-
-With either method, all of the modifications made to your source tree
-will be picked up when nipy is imported.
-
-
-Submitting a patch
-==================
-
-The preferred method to submit a patch is to create a branch of nipy on
-your machine, modify the code and push that branch to your launchpad
-directory.  Then email the list and we will review your code and
-hopefully apply (merge) your patch.  See the instructions for
-:ref:`init_trunk_dev`.
-
-If you do not wish to use bazaar and launchpad, please feel free to
-file a bug report and submit a patch or email the `nipy mailing
-list`_.
-
-Bug reports
-===========
-
-If you find a bug in nipy, please submit a bug report at the `nipy
-bugs`_ launchpad site so that we can fix it.
-
-
-.. include:: doc/links_names.txt
+For installation instructions see documentation

doc/devel/branch_list.png

@@ -0,0 +1,89 @@
+.. _configure-git:
+
+===============
+ Configure git
+===============
+
+.. _git-config-basic:
+
+Overview
+========
+
+::
+
+  git config --global user.email [email protected]
+  git config --global user.name "Your Name Comes Here"
+
+
+In detail
+=========
+
+This is to tell git_ who you are, for labeling any changes you make to
+the code.  The simplest way to do this is from the command line::
+
+  git config --global user.email [email protected]
+  git config --global user.name "Your Name Comes Here"
+
+This will write the settings into your git configuration file - a file
+called ``.gitconfig`` in your home directory. 
+
+Advanced git configuration
+==========================
+
+You might well benefit from some aliases to common commands.
+
+For example, you might well want to be able to shorten ``git checkout`` to ``git co``. 
+
+The easiest way to do this, is to create a ``.gitconfig`` file in your
+home directory, with contents like this::
+
+  [core]
+          editor = emacs
+  [user]
+          email = [email protected]
+          name = Your Name Comes Here
+  [alias]
+          st = status
+          stat = status
+          co = checkout
+  [color]
+          diff = auto
+          status = true
+
+(of course you'll need to set your email and name, and may want to set
+your editor).  If you prefer, you can do the same thing from the command
+line::
+
+  git config --global core.editor emacs
+  git config --global user.email [email protected]
+  git config --global user.name "Your Name Comes Here"
+  git config --global alias.st status
+  git config --global alias.stat status
+  git config --global alias.co checkout
+  git config --global color.diff auto
+  git config --global color.status true
+
+These commands will write to your user's git configuration file
+``~/.gitconfig``.
+
+To set up on another computer, you can copy your ``~/.gitconfig`` file,
+or run the commands above.
+
+Other configuration recommended by Yarik
+========================================
+
+In your ``~/.gitconfig`` file alias section::
+
+   wdiff = diff --color-words
+
+so that ``git wdiff`` gives a nicely formatted output of the diff. 
+
+To enforce summaries when doing merges(``~/.gitconfig`` file again)::
+
+   [merge]
+      summary = true
+
+
+.. include:: git_links.txt
+
+

doc/devel/branch_list_compare.png

@@ -1 +0,0 @@
-.. include:: ../../INSTALL