Add a configuration option to control diffstat after merge

[git.git] / Documentation / git-tools.txt

diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index 0914cbb0ba528653aa50c6a2eb27815bd69d3508..10653ff898c2278f127f097ddf4a79db5615c802 100644 (file)
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
@@ -50,7 +50,7 @@ History Viewers
    gitview is a GTK based repository browser for git
 
 
    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.
 
 
    GITweb provides full-fledged web interface for GIT repositories.
 


@@ -63,12 +63,18 @@ History Viewers
    Currently it is the fastest and most feature rich among the git
    viewers and commit tools.
 
    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
 ---------------------
 
 
 
 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.
 
    git-svn is a simple conduit for changesets between a single Subversion
    branch and git.


@@ -80,6 +86,14 @@ Foreign SCM interface
    series in git back and forth.
 
 
    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
 ------
 
 Others
 ------
 


@@ -95,3 +109,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.
    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.