Merge branch 'dg/run-command-child-cleanup'

diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index d79523f56d063aa4a3ee3181fa224694c7970613..a96403cb8cb720dbf094b06a0dc0b430147298fc 100644 (file)
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
@@ -22,6 +22,9 @@ Alternative/Augmentative Porcelains
    providing generally smoother user experience than the "raw" Core GIT
    itself and indeed many other version control systems.
 
+   Cogito is no longer maintained as most of its functionality
+   is now in core GIT.
+
 
    - *pg* (http://www.spearce.org/category/projects/scm/pg/)
 
@@ -33,7 +36,7 @@ Alternative/Augmentative Porcelains
    - *StGit* (http://www.procode.org/stgit/)
 
    Stacked GIT provides a quilt-like patch management functionality in the
-    GIT environment. You can easily manage your patches in the scope of GIT
+   GIT environment. You can easily manage your patches in the scope of GIT
    until they get merged upstream.
 
 
@@ -42,7 +45,7 @@ History Viewers
 
    - *gitk* (shipped with git-core)
 
-   gitk is a simple TK GUI for browsing history of GIT repositories easily.
+   gitk is a simple Tk GUI for browsing history of GIT repositories easily.
 
 
    - *gitview*  (contrib/)
@@ -50,7 +53,7 @@ History Viewers
    gitview is a GTK based repository browser for git
 
 
-   - *gitweb* (ftp://ftp.kernel.org/pub/software/scm/gitweb/)
+   - *gitweb* (shipped with git-core)
 
    GITweb provides full-fledged web interface for GIT repositories.
 
@@ -63,12 +66,18 @@ History Viewers
    Currently it is the fastest and most feature rich among the git
    viewers and commit tools.
 
+   - *tig* (http://jonas.nitro.dk/tig/)
+
+   tig by Jonas Fonseca is a simple git repository browser
+   written using ncurses. Basically, it just acts as a front-end
+   for git-log and git-show/git-diff. Additionally, you can also
+   use it as a pager for git commands.
 
 
 Foreign SCM interface
 ---------------------
 
-   - *git-svn* (contrib/)
+   - *git-svn* (shipped with git-core)
 
    git-svn is a simple conduit for changesets between a single Subversion
    branch and git.
@@ -80,6 +89,14 @@ Foreign SCM interface
    series in git back and forth.
 
 
+   - *hg-to-git* (contrib/)
+
+   hg-to-git converts a Mercurial repository into a git one, and
+   preserves the full branch history in the process. hg-to-git can
+   also be used in an incremental way to keep the git repository
+   in sync with the master Mercurial repository.
+
+
 Others
 ------
 
@@ -95,3 +112,7 @@ Others
    This is an Emacs interface for git. The user interface is modeled on
    pcl-cvs. It has been developed on Emacs 21 and will probably need some
    tweaking to work on XEmacs.
+
+
+http://git.or.cz/gitwiki/InterfacesFrontendsAndTools has more
+comprehensive list.