From f25b98e6f88cc19a749b6bf71306d1cc804a7bf4 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Fri, 24 Jul 2015 00:00:54 -0400 Subject: [PATCH 1/5] Documentation/git: drop outdated Cogito reference Cogito hasn't been maintained since late 2006, so drop the reference to it. The warning that SCMS front-ends might override listed environment variables, however, may still be valuable, so keep it but generalize the wording. Suggested-by: Junio C Hamano Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index ef76f95270..21bc0a5be3 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -744,7 +744,7 @@ The Git Repository ~~~~~~~~~~~~~~~~~~ These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above -Git so take care if using Cogito etc. +Git so take care if using a foreign front-end. 'GIT_INDEX_FILE':: This environment allows the specification of an alternate From fd8c620cd9d80fe1276745a80efcdac929e2aa6d Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 28 Jul 2015 16:06:12 -0400 Subject: [PATCH 2/5] Documentation/git-tools: improve discoverability of Git wiki These days, the best way to find Git-related tools is via a search engine. The Git wiki may be a distant second, and git-tools.txt falls in last place. Therefore, promote the Git wiki reference to the top of git-tools.txt so the reader will encounter it first, rather than hiding it away at the very bottom. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-tools.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt index 78a0d955ec..129b8c0c49 100644 --- a/Documentation/git-tools.txt +++ b/Documentation/git-tools.txt @@ -6,10 +6,11 @@ Introduction ------------ Apart from Git contrib/ area there are some others third-party tools -you may want to look. - +you may want to look at. This document presents a brief summary of each tool and the corresponding link. +For a more comprehensive list, see: +http://git.or.cz/gitwiki/InterfacesFrontendsAndTools Alternative/Augmentative Porcelains @@ -112,7 +113,3 @@ Others This is an Emacs interface for Git. The user interface is modelled 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. From e810f93977e7edfbe0d1574dc8b303bebd0329a4 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 28 Jul 2015 16:06:13 -0400 Subject: [PATCH 3/5] Documentation/git-tools: fix item text formatting Descriptive text for each tool item is incorrectly formatted using a fixed width font. Fix formatting to use a variable width font by unindenting the item text. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-tools.txt | 132 ++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt index 129b8c0c49..ab4aab9900 100644 --- a/Documentation/git-tools.txt +++ b/Documentation/git-tools.txt @@ -16,100 +16,100 @@ http://git.or.cz/gitwiki/InterfacesFrontendsAndTools Alternative/Augmentative Porcelains ----------------------------------- - - *Cogito* (http://www.kernel.org/pub/software/scm/cogito/) - - Cogito is a version control system layered on top of the Git tree history - storage system. It aims at seamless user interface and ease of use, - 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. +- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/) ++ +Cogito is a version control system layered on top of the Git tree history +storage system. It aims at seamless user interface and ease of use, +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/) - - pg is a shell script wrapper around Git to help the user manage a set of - patches to files. pg is somewhat like quilt or StGit, but it does have a - slightly different feature set. +- *pg* (http://www.spearce.org/category/projects/scm/pg/) ++ +pg is a shell script wrapper around Git to help the user manage a set of +patches to files. pg is somewhat like quilt or StGit, but it does have a +slightly different feature set. - - *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 - until they get merged upstream. +- *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 +until they get merged upstream. History Viewers --------------- - - *gitk* (shipped with git-core) - - gitk is a simple Tk GUI for browsing history of Git repositories easily. +- *gitk* (shipped with git-core) ++ +gitk is a simple Tk GUI for browsing history of Git repositories easily. - - *gitview* (contrib/) - - gitview is a GTK based repository browser for Git +- *gitview* (contrib/) ++ +gitview is a GTK based repository browser for Git - - *gitweb* (shipped with git-core) - - Gitweb provides full-fledged web interface for Git repositories. +- *gitweb* (shipped with git-core) ++ +Gitweb provides full-fledged web interface for Git repositories. - - *qgit* (http://digilander.libero.it/mcostalba/) +- *qgit* (http://digilander.libero.it/mcostalba/) ++ +QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used +to browse history and directory tree, view annotated files, commit +changes cherry picking single files or applying patches. +Currently it is the fastest and most feature rich among the Git +viewers and commit tools. - QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used - to browse history and directory tree, view annotated files, commit - changes cherry picking single files or applying patches. - 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. +- *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* (shipped with git-core) - - git-svn is a simple conduit for changesets between a single Subversion - branch and Git. +- *git-svn* (shipped with git-core) ++ +git-svn is a simple conduit for changesets between a single Subversion +branch and Git. - - *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc) - - These utilities convert patch series in a quilt repository and commit - series in Git back and forth. +- *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc) ++ +These utilities convert patch series in a quilt repository and commit +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. +- *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 ------ - - *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/) +- *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/) ++ +Commit Tool or (h)gct is a GUI enabled commit tool for Git and +Mercurial (hg). It allows the user to view diffs, select which files +to committed (or ignored / reverted) write commit messages and +perform the commit itself. - Commit Tool or (h)gct is a GUI enabled commit tool for Git and - Mercurial (hg). It allows the user to view diffs, select which files - to committed (or ignored / reverted) write commit messages and - perform the commit itself. - - - *git.el* (contrib/) - - This is an Emacs interface for Git. The user interface is modelled on - pcl-cvs. It has been developed on Emacs 21 and will probably need some - tweaking to work on XEmacs. +- *git.el* (contrib/) ++ +This is an Emacs interface for Git. The user interface is modelled on +pcl-cvs. It has been developed on Emacs 21 and will probably need some +tweaking to work on XEmacs. From dd7961c0fba87a445c4807d089594a82a1a323e9 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 28 Jul 2015 16:06:14 -0400 Subject: [PATCH 4/5] Documentation/git-tools: drop references to defunct tools Cogito -- unmaintained since late 2006[1] pg -- URL dead; web searches reveal no information quilt2git -- URL dead; web searches reveal no information (h)gct -- URL dead; no repository activity since 2007[2] [1]: http://git.or.cz/cogito/ [2]: http://repo.or.cz/w/hgct.git Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-tools.txt | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt index ab4aab9900..48a3595c5c 100644 --- a/Documentation/git-tools.txt +++ b/Documentation/git-tools.txt @@ -16,24 +16,6 @@ http://git.or.cz/gitwiki/InterfacesFrontendsAndTools Alternative/Augmentative Porcelains ----------------------------------- -- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/) -+ -Cogito is a version control system layered on top of the Git tree history -storage system. It aims at seamless user interface and ease of use, -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/) -+ -pg is a shell script wrapper around Git to help the user manage a set of -patches to files. pg is somewhat like quilt or StGit, but it does have a -slightly different feature set. - - - *StGit* (http://www.procode.org/stgit/) + Stacked Git provides a quilt-like patch management functionality in the @@ -84,12 +66,6 @@ git-svn is a simple conduit for changesets between a single Subversion branch and Git. -- *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc) -+ -These utilities convert patch series in a quilt repository and commit -series in Git back and forth. - - - *hg-to-git* (contrib/) + hg-to-git converts a Mercurial repository into a Git one, and @@ -101,13 +77,6 @@ in sync with the master Mercurial repository. Others ------ -- *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/) -+ -Commit Tool or (h)gct is a GUI enabled commit tool for Git and -Mercurial (hg). It allows the user to view diffs, select which files -to committed (or ignored / reverted) write commit messages and -perform the commit itself. - - *git.el* (contrib/) + This is an Emacs interface for Git. The user interface is modelled on From 1c601af25a1d182420da11d20bc8862823e47012 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 28 Jul 2015 16:06:15 -0400 Subject: [PATCH 5/5] Documentation/git-tools: retire manually-maintained list When Git was young, people looking for third-party Git-related tools came to the Git project itself to find them, so it made sense to maintain a list of tools here. These days, however, search engines fill that role much more efficiently, so retire the manually-maintained list. The list of front-ends and tools on the Git wiki rates perhaps a distant second to search engines, and may still have value, so retain a reference to it. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-tools.txt | 88 +++---------------------------------- 1 file changed, 7 insertions(+), 81 deletions(-) diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt index 48a3595c5c..2f4ff50156 100644 --- a/Documentation/git-tools.txt +++ b/Documentation/git-tools.txt @@ -1,84 +1,10 @@ -A short Git tools survey -======================== +Git Tools +========= +When Git was young, people looking for third-party Git-related tools came +to the Git project itself to find them, thus a list of such tools was +maintained here. These days, however, search engines fill that role much +more efficiently, so this manually-maintained list has been retired. -Introduction ------------- - -Apart from Git contrib/ area there are some others third-party tools -you may want to look at. -This document presents a brief summary of each tool and the corresponding -link. -For a more comprehensive list, see: +See also the `contrib/` area, and the Git wiki: http://git.or.cz/gitwiki/InterfacesFrontendsAndTools - - -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 -until they get merged upstream. - - -History Viewers ---------------- - -- *gitk* (shipped with git-core) -+ -gitk is a simple Tk GUI for browsing history of Git repositories easily. - - -- *gitview* (contrib/) -+ -gitview is a GTK based repository browser for Git - - -- *gitweb* (shipped with git-core) -+ -Gitweb provides full-fledged web interface for Git repositories. - - -- *qgit* (http://digilander.libero.it/mcostalba/) -+ -QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used -to browse history and directory tree, view annotated files, commit -changes cherry picking single files or applying patches. -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* (shipped with git-core) -+ -git-svn is a simple conduit for changesets between a single Subversion -branch and Git. - - -- *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 ------- - -- *git.el* (contrib/) -+ -This is an Emacs interface for Git. The user interface is modelled on -pcl-cvs. It has been developed on Emacs 21 and will probably need some -tweaking to work on XEmacs.