DOC - updated to newest gitwash

jarrodmillman · jarrodmillman · commit 9ae7afe4a37a · 2010-07-20T22:53:48.000-07:00
diff --git a/doc/devel/guidelines/gitwash/configure_git.rst b/doc/devel/guidelines/gitwash/configure_git.rst
@@ -69,8 +69,8 @@ These commands will write to your user's git configuration file
 To set up on another computer, you can copy your ``~/.gitconfig`` file,
 or run the commands above.
 
-Other configuration recommended by Yarik
-========================================
+Other recommended configurations
+================================
 
 In your ``~/.gitconfig`` file alias section::
 
@@ -83,7 +83,9 @@ To enforce summaries when doing merges(``~/.gitconfig`` file again)::
    [merge]
       summary = true
 
+Or from the command line::
 
-.. include:: git_links.txt
-
+  git config --global alias.wdiff "diff --color-words"
+  git config --global merge.summary true
 
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/development_workflow.rst b/doc/devel/guidelines/gitwash/development_workflow.rst
@@ -149,7 +149,7 @@ Overview
    # pull changes from github
    git fetch upstream
    # merge from upstream
-   git merge upstream master
+   git merge upstream/master
 
 In detail
 ---------
@@ -230,4 +230,4 @@ To see a linear list of commits for this branch::
 You can also look at the `network graph visualizer`_ for your github_
 repo.
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/following_latest.rst b/doc/devel/guidelines/gitwash/following_latest.rst
@@ -33,4 +33,4 @@ From time to time you may want to pull down the latest code.  Do this with::
 The tree in ``nipy`` will now have the latest changes from the initial
 repository.
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/forking_hell.rst b/doc/devel/guidelines/gitwash/forking_hell.rst
@@ -29,5 +29,5 @@ Create your own forked copy of nipy_
    Now, after a short pause and some 'Hardcore forking action', you
    should find yourself at the home page for your own forked copy of nipy_.
 
-.. include:: git_links.txt
+.. include:: git_links.inc
 
diff --git a/doc/devel/guidelines/gitwash/git_install.rst b/doc/devel/guidelines/gitwash/git_install.rst
@@ -23,4 +23,4 @@ Have a look at the github_ install help pages available from `github help`_
 
 There are good instructions here: http://book.git-scm.com/2_installing_git.html
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/git_intro.rst b/doc/devel/guidelines/gitwash/git_intro.rst
@@ -15,4 +15,4 @@ should get you started.
 
 For general resources for learning git_ see :ref:`git-resources`.
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/git_links.inc b/doc/devel/guidelines/gitwash/git_links.inc
@@ -14,15 +14,20 @@
 .. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel
 
 .. nipy
-.. _nipy: http://neuroimaging.scipy.org
-.. _`nipy github`: http://github.com/nipy
-.. _`nipy mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel
+.. _nipy: http://nipy.org/nipy
+.. _`nipy github`: http://github.com/nipy/nipy
+.. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
 
 .. ipython
 .. _ipython: http://ipython.scipy.org
-.. _`ipython github`: http://github.com/ipython
+.. _`ipython github`: http://github.com/ipython/ipython
 .. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev
 
+.. dipy
+.. _dipy: http://nipy.org/dipy
+.. _`dipy github`: http://github.com/Garyfallidis/dipy
+.. _`dipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
+
 .. git stuff
 .. _git: http://git-scm.com/
 .. _github: http://github.com
diff --git a/doc/devel/guidelines/gitwash/git_resources.rst b/doc/devel/guidelines/gitwash/git_resources.rst
@@ -54,4 +54,4 @@ online manual pages for some common commands:
 * `git remote`_
 * `git status`_
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/patching.rst b/doc/devel/guidelines/gitwash/patching.rst
@@ -120,4 +120,4 @@ Fork the nipy_ repository on github_ - :ref:`forking`.  Then::
 
 Then you can, if you want, follow the :ref:`development-workflow`.
 
-.. include:: git_links.txt
+.. include:: git_links.inc
diff --git a/doc/devel/guidelines/gitwash/set_up_fork.rst b/doc/devel/guidelines/gitwash/set_up_fork.rst
@@ -64,5 +64,5 @@ Just for your own satisfaction, show yourself that you now have a new
    origin	git@github.com:your-user-name/nipy.git (fetch)
    origin	git@github.com:your-user-name/nipy.git (push)
 
-.. include:: git_links.txt
+.. include:: git_links.inc
 

Original file line number	Diff line number	Diff line change
@@ -23,4 +23,4 @@ Have a look at the github_ install help pages available from `github help`_
`23`	`23`
`24`	`24`	`There are good instructions here: http://book.git-scm.com/2_installing_git.html`
`25`	`25`
`26`		`-.. include:: git_links.txt`
	`26`	`+.. include:: git_links.inc`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ should get you started.`
`15`	`15`
`16`	`16`	For general resources for learning git_ see :ref:`git-resources`.
`17`	`17`
`18`		`-.. include:: git_links.txt`
	`18`	`+.. include:: git_links.inc`
Original file line number	Diff line number	Diff line change
@@ -120,4 +120,4 @@ Fork the nipy_ repository on github_ - :ref:`forking`. Then::
`120`	`120`
`121`	`121`	Then you can, if you want, follow the :ref:`development-workflow`.
`122`	`122`
`123`		`-.. include:: git_links.txt`
	`123`	`+.. include:: git_links.inc`