{"thread":{"id":"39928","subject":"[PATCH 0/6] minor documentation improvements","startedAt":"2015-07-24T04:00:51Z","lastAt":"2015-07-28T20:33:06Z","messageCount":13,"participants":["Eric Sunshine","Junio C Hamano","Michael Haggerty"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"266696","messageId":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":null,"subject":"[PATCH 0/6] minor documentation improvements","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:51Z","receivedAt":"2015-07-24T04:00:51Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"This is a set of minor documentation improvements, prompted by\nsuggestions from Junio and Michael Haggerty, plus a few things I\ndiscovered in the process. It is built atop 'es/worktree-add' in\n'next' in order to avoid conflicts with changes in that series (but\nis otherwise not related to those patches).\n\nEric Sunshine (6):\n Documentation/git-worktree: fix broken 'linkgit' invocation\n Documentation/config: mention \"now\" and \"never\" for 'expire' settings\n Documentation/git: drop outdated Cogito reference\n Documentation/git-tools: improve discoverability of Git wiki\n Documentation/git-tools: fix item text formatting\n Documentation/git-tools: drop references to defunct tools\n\n Documentation/config.txt | 13 +++--\n Documentation/git-tools.txt | 124 +++++++++++++++--------------------------\n Documentation/git-worktree.txt | 2 +-\n Documentation/git.txt | 2 +-\n 4 files changed, 55 insertions(+), 86 deletions(-)\n\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266700","messageId":"1437710457-38592-2-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 1/6] Documentation/git-worktree: fix broken 'linkgit' invocation","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:52Z","receivedAt":"2015-07-24T04:00:52Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"Signed-off-by: Eric Sunshine \n---\n Documentation/git-worktree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 332dd77..400b313 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.\n When you are done with a linked working tree you can simply delete it.\n The working tree's administrative files in the repository (see\n \"DETAILS\" below) will eventually be removed automatically (see\n-`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run\n+`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run\n `git worktree prune` in the main or any linked working tree to\n clean up any stale administrative files.\n \n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266698","messageId":"1437710457-38592-3-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 2/6] Documentation/config: mention \"now\" and \"never\" for 'expire' settings","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:53Z","receivedAt":"2015-07-24T04:00:53Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"In addition to approxidate-style values (\"2.months.ago\", \"yesterday\"),\nconsumers of 'gc.*expire*' configuration variables also accept and\nrespect 'now'/'all' (\"do it immediately\") and 'never'/'false' (\"suppress\nentirely\").\n\nSuggested-by: Michael Haggerty \nSigned-off-by: Eric Sunshine \n---\n\nReference: http://article.gmane.org/gmane.comp.version-control.git/274325\n\nI sneaked in a minor whitespace fix.\n\n Documentation/config.txt | 13 ++++++++-----\n 1 file changed, 8 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 1a8a399..cc920c0 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1307,20 +1307,22 @@ gc.packRefs::\n gc.pruneExpire::\n \tWhen 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n \tOverride the grace period with this config variable. The value\n-\t\"now\" may be used to disable this grace period and always prune\n-\tunreachable objects immediately.\n+\t\"now\" may be used to disable this grace period and always prune\n+\tunreachable objects immediately; or \"never\" to suppress pruning.\n \n gc.worktreePruneExpire::\n \tWhen 'git gc' is run, it calls\n \t'git worktree prune --expire 3.months.ago'.\n \tThis config variable can be used to set a different grace\n \tperiod. The value \"now\" may be used to disable the grace\n-\tperiod and prune $GIT_DIR/worktrees immediately.\n+\tperiod and prune $GIT_DIR/worktrees immediately; or \"never\" to\n+\tsuppress pruning.\n \n gc.reflogExpire::\n gc..reflogExpire::\n \t'git reflog expire' removes reflog entries older than\n-\tthis time; defaults to 90 days. With \"\" (e.g.\n+\tthis time; defaults to 90 days. The value \"all\" expires all\n+\tentries; and \"false\" disables expiration. With \"\" (e.g.\n \t\"refs/stash\") in the middle the setting applies only to\n \tthe refs that match the .\n \n@@ -1328,7 +1330,8 @@ gc.reflogExpireUnreachable::\n gc..reflogExpireUnreachable::\n \t'git reflog expire' removes reflog entries older than\n \tthis time and are not reachable from the current tip;\n-\tdefaults to 30 days. With \"\" (e.g. \"refs/stash\")\n+\tdefaults to 30 days. The value \"all\" expires all entries; and\n+\t\"false\" disables expiration. With \"\" (e.g. \"refs/stash\")\n \tin the middle, the setting applies only to the refs that\n \tmatch the .\n \n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266697","messageId":"1437710457-38592-4-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 3/6] Documentation/git: drop outdated Cogito reference","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:54Z","receivedAt":"2015-07-24T04:00:54Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"Cogito hasn't been maintained since late 2006, so drop the reference\nto it. The warning that SCMS front-ends might override listed\nenvironment variables, however, may still be valuable, so keep it but\ngeneralize the wording.\n\nSuggested-by: Junio C Hamano \nSigned-off-by: Eric Sunshine \n---\n\nReference: http://article.gmane.org/gmane.comp.version-control.git/274084\n\n Documentation/git.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 1e8a569..ef774be 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -774,7 +774,7 @@ The Git Repository\n ~~~~~~~~~~~~~~~~~~\n These environment variables apply to 'all' core Git commands. Nb: it\n is worth noting that they may be used/overridden by SCMS sitting above\n-Git so take care if using Cogito etc.\n+Git so take care if using a foreign front-end.\n \n 'GIT_INDEX_FILE'::\n \tThis environment allows the specification of an alternate\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266701","messageId":"1437710457-38592-5-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 4/6] Documentation/git-tools: improve discoverability of Git wiki","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:55Z","receivedAt":"2015-07-24T04:00:55Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"These days, the best way to find Git-related tools is via a search\nengine. Second best may be the Git wiki. git-tools.txt falls in last\nplace. Therefore, promote the Git wiki reference to the top of\ngit-tools.txt so the reader will encounter it first, rather than\nhiding it away at the very bottom.\n\nSigned-off-by: Eric Sunshine \n---\n\nI sneaked in a minor grammatical fix.\n\n Documentation/git-tools.txt | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex 78a0d95..129b8c0 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -6,10 +6,11 @@ Introduction\n ------------\n \n Apart from Git contrib/ area there are some others third-party tools\n-you may want to look.\n-\n+you may want to look at.\n This document presents a brief summary of each tool and the corresponding\n link.\n+For a more comprehensive list, see:\n+http://git.or.cz/gitwiki/InterfacesFrontendsAndTools\n \n \n Alternative/Augmentative Porcelains\n@@ -112,7 +113,3 @@ Others\n This is an Emacs interface for Git. The user interface is modelled on\n pcl-cvs. It has been developed on Emacs 21 and will probably need some\n tweaking to work on XEmacs.\n-\n-\n-http://git.or.cz/gitwiki/InterfacesFrontendsAndTools has more\n-comprehensive list.\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266702","messageId":"1437710457-38592-6-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 5/6] Documentation/git-tools: fix item text formatting","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:56Z","receivedAt":"2015-07-24T04:00:56Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"Descriptive text for each tool item is incorrectly formatted using a\nfixed width font. Fix formatting to use a variable width font by\nunindenting the item text.\n\nSigned-off-by: Eric Sunshine \n---\n Documentation/git-tools.txt | 134 ++++++++++++++++++++++----------------------\n 1 file changed, 67 insertions(+), 67 deletions(-)\n\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex 129b8c0..ab4aab9 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -16,100 +16,100 @@ http://git.or.cz/gitwiki/InterfacesFrontendsAndTools\n Alternative/Augmentative Porcelains\n -----------------------------------\n \n- - *Cogito* (http://www.kernel.org/pub/software/scm/cogito/)\n+- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/)\n++\n+Cogito is a version control system layered on top of the Git tree history\n+storage system. It aims at seamless user interface and ease of use,\n+providing generally smoother user experience than the \"raw\" Core Git\n+itself and indeed many other version control systems.\n++\n+Cogito is no longer maintained as most of its functionality\n+is now in core Git.\n \n- Cogito is a version control system layered on top of the Git tree history\n- storage system. It aims at seamless user interface and ease of use,\n- providing generally smoother user experience than the \"raw\" Core Git\n- itself and indeed many other version control systems.\n \n- Cogito is no longer maintained as most of its functionality\n- is now in core Git.\n+- *pg* (http://www.spearce.org/category/projects/scm/pg/)\n++\n+pg is a shell script wrapper around Git to help the user manage a set of\n+patches to files. pg is somewhat like quilt or StGit, but it does have a\n+slightly different feature set.\n \n \n- - *pg* (http://www.spearce.org/category/projects/scm/pg/)\n-\n- pg is a shell script wrapper around Git to help the user manage a set of\n- patches to files. pg is somewhat like quilt or StGit, but it does have a\n- slightly different feature set.\n-\n-\n- - *StGit* (http://www.procode.org/stgit/)\n-\n- Stacked Git provides a quilt-like patch management functionality in the\n- Git environment. You can easily manage your patches in the scope of Git\n- until they get merged upstream.\n+- *StGit* (http://www.procode.org/stgit/)\n++\n+Stacked Git provides a quilt-like patch management functionality in the\n+Git environment. You can easily manage your patches in the scope of Git\n+until they get merged upstream.\n \n \n History Viewers\n ---------------\n \n- - *gitk* (shipped with git-core)\n-\n- gitk is a simple Tk GUI for browsing history of Git repositories easily.\n-\n-\n- - *gitview* (contrib/)\n-\n- gitview is a GTK based repository browser for Git\n+- *gitk* (shipped with git-core)\n++\n+gitk is a simple Tk GUI for browsing history of Git repositories easily.\n \n \n- - *gitweb* (shipped with git-core)\n+- *gitview* (contrib/)\n++\n+gitview is a GTK based repository browser for Git\n \n- Gitweb provides full-fledged web interface for Git repositories.\n \n+- *gitweb* (shipped with git-core)\n++\n+Gitweb provides full-fledged web interface for Git repositories.\n \n- - *qgit* (http://digilander.libero.it/mcostalba/)\n \n- QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used\n- to browse history and directory tree, view annotated files, commit\n- changes cherry picking single files or applying patches.\n- Currently it is the fastest and most feature rich among the Git\n- viewers and commit tools.\n+- *qgit* (http://digilander.libero.it/mcostalba/)\n++\n+QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used\n+to browse history and directory tree, view annotated files, commit\n+changes cherry picking single files or applying patches.\n+Currently it is the fastest and most feature rich among the Git\n+viewers and commit tools.\n \n- - *tig* (http://jonas.nitro.dk/tig/)\n-\n- tig by Jonas Fonseca is a simple Git repository browser\n- written using ncurses. Basically, it just acts as a front-end\n- for git-log and git-show/git-diff. Additionally, you can also\n- use it as a pager for Git commands.\n+- *tig* (http://jonas.nitro.dk/tig/)\n++\n+tig by Jonas Fonseca is a simple Git repository browser\n+written using ncurses. Basically, it just acts as a front-end\n+for git-log and git-show/git-diff. Additionally, you can also\n+use it as a pager for Git commands.\n \n \n Foreign SCM interface\n ---------------------\n \n- - *git-svn* (shipped with git-core)\n-\n- git-svn is a simple conduit for changesets between a single Subversion\n- branch and Git.\n-\n-\n- - *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc)\n+- *git-svn* (shipped with git-core)\n++\n+git-svn is a simple conduit for changesets between a single Subversion\n+branch and Git.\n \n- These utilities convert patch series in a quilt repository and commit\n- series in Git back and forth.\n \n+- *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc)\n++\n+These utilities convert patch series in a quilt repository and commit\n+series in Git back and forth.\n \n- - *hg-to-git* (contrib/)\n \n- hg-to-git converts a Mercurial repository into a Git one, and\n- preserves the full branch history in the process. hg-to-git can\n- also be used in an incremental way to keep the Git repository\n- in sync with the master Mercurial repository.\n+- *hg-to-git* (contrib/)\n++\n+hg-to-git converts a Mercurial repository into a Git one, and\n+preserves the full branch history in the process. hg-to-git can\n+also be used in an incremental way to keep the Git repository\n+in sync with the master Mercurial repository.\n \n \n Others\n ------\n \n- - *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/)\n-\n- Commit Tool or (h)gct is a GUI enabled commit tool for Git and\n- Mercurial (hg). It allows the user to view diffs, select which files\n- to committed (or ignored / reverted) write commit messages and\n- perform the commit itself.\n-\n- - *git.el* (contrib/)\n-\n- This is an Emacs interface for Git. The user interface is modelled on\n- pcl-cvs. It has been developed on Emacs 21 and will probably need some\n- tweaking to work on XEmacs.\n+- *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/)\n++\n+Commit Tool or (h)gct is a GUI enabled commit tool for Git and\n+Mercurial (hg). It allows the user to view diffs, select which files\n+to committed (or ignored / reverted) write commit messages and\n+perform the commit itself.\n+\n+- *git.el* (contrib/)\n++\n+This is an Emacs interface for Git. The user interface is modelled on\n+pcl-cvs. It has been developed on Emacs 21 and will probably need some\n+tweaking to work on XEmacs.\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266699","messageId":"1437710457-38592-7-git-send-email-sunshine@sunshineco.com","threadId":"39928","inReplyTo":"1437710457-38592-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH 6/6] Documentation/git-tools: drop references to defunct tools","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T04:00:57Z","receivedAt":"2015-07-24T04:00:57Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"Cogito -- unmaintained since late 2006[1]\npg -- URL dead; web searches reveal no information\nquilt2git -- URL dead; web searches reveal no information\n(h)gct -- URL dead; no repository activity since 2007[2]\n\n[1]: http://git.or.cz/cogito/\n[2]: http://repo.or.cz/w/hgct.git\n\nSigned-off-by: Eric Sunshine \n---\n\nPerhaps it would be better to drop all items, and retain only the link\nto the Git wiki?\n\n Documentation/git-tools.txt | 31 -------------------------------\n 1 file changed, 31 deletions(-)\n\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex ab4aab9..48a3595 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -16,24 +16,6 @@ http://git.or.cz/gitwiki/InterfacesFrontendsAndTools\n Alternative/Augmentative Porcelains\n -----------------------------------\n \n-- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/)\n-+\n-Cogito is a version control system layered on top of the Git tree history\n-storage system. It aims at seamless user interface and ease of use,\n-providing generally smoother user experience than the \"raw\" Core Git\n-itself and indeed many other version control systems.\n-+\n-Cogito is no longer maintained as most of its functionality\n-is now in core Git.\n-\n-\n-- *pg* (http://www.spearce.org/category/projects/scm/pg/)\n-+\n-pg is a shell script wrapper around Git to help the user manage a set of\n-patches to files. pg is somewhat like quilt or StGit, but it does have a\n-slightly different feature set.\n-\n-\n - *StGit* (http://www.procode.org/stgit/)\n +\n Stacked Git provides a quilt-like patch management functionality in the\n@@ -84,12 +66,6 @@ git-svn is a simple conduit for changesets between a single Subversion\n branch and Git.\n \n \n-- *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc)\n-+\n-These utilities convert patch series in a quilt repository and commit\n-series in Git back and forth.\n-\n-\n - *hg-to-git* (contrib/)\n +\n hg-to-git converts a Mercurial repository into a Git one, and\n@@ -101,13 +77,6 @@ in sync with the master Mercurial repository.\n Others\n ------\n \n-- *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/)\n-+\n-Commit Tool or (h)gct is a GUI enabled commit tool for Git and\n-Mercurial (hg). It allows the user to view diffs, select which files\n-to committed (or ignored / reverted) write commit messages and\n-perform the commit itself.\n-\n - *git.el* (contrib/)\n +\n This is an Emacs interface for Git. The user interface is modelled on\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266733","messageId":"xmqqmvylmnzp.fsf@gitster.dls.corp.google.com","threadId":"39928","inReplyTo":"1437710457-38592-7-git-send-email-sunshine@sunshineco.com","subject":"Re: [PATCH 6/6] Documentation/git-tools: drop references to defunct tools","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-24T18:03:54Z","receivedAt":"2015-07-24T18:03:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine writes:\n\n> Cogito -- unmaintained since late 2006[1]\n> pg -- URL dead; web searches reveal no information\n> quilt2git -- URL dead; web searches reveal no information\n> (h)gct -- URL dead; no repository activity since 2007[2]\n>\n> [1]: http://git.or.cz/cogito/\n> [2]: http://repo.or.cz/w/hgct.git\n>\n> Signed-off-by: Eric Sunshine \n> ---\n>\n> Perhaps it would be better to drop all items, and retain only the link\n> to the Git wiki?\n\nHmmm, that's a very tempting thought.\n"},{"id":"266760","messageId":"20150724213453.GA3328@flurp.local","threadId":"39928","inReplyTo":"xmqqmvylmnzp.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH 6/6] Documentation/git-tools: drop references to defunct tools","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-24T21:34:53Z","receivedAt":"2015-07-24T21:34:53Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Jul 24, 2015 at 11:03:54AM -0700, Junio C Hamano wrote:\n> Eric Sunshine writes:\n> > Cogito -- unmaintained since late 2006[1]\n> > pg -- URL dead; web searches reveal no information\n> > quilt2git -- URL dead; web searches reveal no information\n> > (h)gct -- URL dead; no repository activity since 2007[2]\n> >\n> > [1]: http://git.or.cz/cogito/\n> > [2]: http://repo.or.cz/w/hgct.git\n> >\n> > Signed-off-by: Eric Sunshine \n> > ---\n> > Perhaps it would be better to drop all items, and retain only the link\n> > to the Git wiki?\n> \n> Hmmm, that's a very tempting thought.\n\nHere it is in patch form atop the present series[1]. By plopping this\nchange atop the other patches, the decision to retire or keep the list\nof tools becomes as easy as either retaining or dropping this one patch\n(as opposed to re-rolling the entire series).\n\n[1]: http://thread.gmane.org/gmane.comp.version-control.git/274537\n\n\n---- 8< ----\nFrom: Eric Sunshine \nSubject: [PATCH 7/6] Documentation/git-tools: retire manually maintained list; keep only wiki\n\nWhen Git was young, people looking for third-party Git-related tools\ncame to the Git project itself to find them, so it made sense to\nmaintain a list of tools here. These days, however, search engines fill\nthat role much more efficiently, so retire this manually-maintained\nlist.\n\nThe list of front-ends and tools on the Git wiki rates perhaps a distant\nsecond to search engines, and may still have value, so retain a\nreference to it.\n\nSigned-off-by: Eric Sunshine \n---\n Documentation/git-tools.txt | 88 ++++-----------------------------------------\n 1 file changed, 7 insertions(+), 81 deletions(-)\n\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex 48a3595..2f4ff50 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -1,84 +1,10 @@\n-A short Git tools survey\n-========================\n+Git Tools\n+=========\n \n+When Git was young, people looking for third-party Git-related tools came\n+to the Git project itself to find them, thus a list of such tools was\n+maintained here. These days, however, search engines fill that role much\n+more efficiently, so this manually-maintained list has been retired.\n \n-Introduction\n-------------\n-\n-Apart from Git contrib/ area there are some others third-party tools\n-you may want to look at.\n-This document presents a brief summary of each tool and the corresponding\n-link.\n-For a more comprehensive list, see:\n+See also the `contrib/` area, and the Git wiki:\n http://git.or.cz/gitwiki/InterfacesFrontendsAndTools\n-\n-\n-Alternative/Augmentative Porcelains\n------------------------------------\n-\n-- *StGit* (http://www.procode.org/stgit/)\n-+\n-Stacked Git provides a quilt-like patch management functionality in the\n-Git environment. You can easily manage your patches in the scope of Git\n-until they get merged upstream.\n-\n-\n-History Viewers\n----------------\n-\n-- *gitk* (shipped with git-core)\n-+\n-gitk is a simple Tk GUI for browsing history of Git repositories easily.\n-\n-\n-- *gitview* (contrib/)\n-+\n-gitview is a GTK based repository browser for Git\n-\n-\n-- *gitweb* (shipped with git-core)\n-+\n-Gitweb provides full-fledged web interface for Git repositories.\n-\n-\n-- *qgit* (http://digilander.libero.it/mcostalba/)\n-+\n-QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used\n-to browse history and directory tree, view annotated files, commit\n-changes cherry picking single files or applying patches.\n-Currently it is the fastest and most feature rich among the Git\n-viewers and commit tools.\n-\n-- *tig* (http://jonas.nitro.dk/tig/)\n-+\n-tig by Jonas Fonseca is a simple Git repository browser\n-written using ncurses. Basically, it just acts as a front-end\n-for git-log and git-show/git-diff. Additionally, you can also\n-use it as a pager for Git commands.\n-\n-\n-Foreign SCM interface\n----------------------\n-\n-- *git-svn* (shipped with git-core)\n-+\n-git-svn is a simple conduit for changesets between a single Subversion\n-branch and Git.\n-\n-\n-- *hg-to-git* (contrib/)\n-+\n-hg-to-git converts a Mercurial repository into a Git one, and\n-preserves the full branch history in the process. hg-to-git can\n-also be used in an incremental way to keep the Git repository\n-in sync with the master Mercurial repository.\n-\n-\n-Others\n-------\n-\n-- *git.el* (contrib/)\n-+\n-This is an Emacs interface for Git. The user interface is modelled on\n-pcl-cvs. It has been developed on Emacs 21 and will probably need some\n-tweaking to work on XEmacs.\n-- \n2.5.0.rc3.407.g68aafd0\n"},{"id":"266800","messageId":"55B58C3B.7040200@alum.mit.edu","threadId":"39928","inReplyTo":"1437710457-38592-3-git-send-email-sunshine@sunshineco.com","subject":"Re: [PATCH 2/6] Documentation/config: mention \"now\" and \"never\" for 'expire' settings","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2015-07-27T01:41:15Z","receivedAt":"2015-07-27T01:41:15Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"On 07/23/2015 09:00 PM, Eric Sunshine wrote:\n> In addition to approxidate-style values (\"2.months.ago\", \"yesterday\"),\n> consumers of 'gc.*expire*' configuration variables also accept and\n> respect 'now'/'all' (\"do it immediately\") and 'never'/'false' (\"suppress\n> entirely\").\n> \n> Suggested-by: Michael Haggerty \n> Signed-off-by: Eric Sunshine \n> ---\n> \n> Reference: http://article.gmane.org/gmane.comp.version-control.git/274325\n> \n> I sneaked in a minor whitespace fix.\n> \n> Documentation/config.txt | 13 ++++++++-----\n> 1 file changed, 8 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 1a8a399..cc920c0 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -1307,20 +1307,22 @@ gc.packRefs::\n> gc.pruneExpire::\n> \tWhen 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n> \tOverride the grace period with this config variable. The value\n> -\t\"now\" may be used to disable this grace period and always prune\n> -\tunreachable objects immediately.\n> +\t\"now\" may be used to disable this grace period and always prune\n> +\tunreachable objects immediately; or \"never\" to suppress pruning.\n\nA semicolon should be used without a conjunction, and the parts of a\nsentence joined by a semicolon should be independent clauses. So this\nshould probably be\n\n [...] The value\n \"now\" may be used to disable this grace period and always prune\n unreachable objects immediately, or \"never\" may be used to\n suppress pruning.\n\n> gc.worktreePruneExpire::\n> \tWhen 'git gc' is run, it calls\n> \t'git worktree prune --expire 3.months.ago'.\n> \tThis config variable can be used to set a different grace\n> \tperiod. The value \"now\" may be used to disable the grace\n> -\tperiod and prune $GIT_DIR/worktrees immediately.\n> +\tperiod and prune $GIT_DIR/worktrees immediately; or \"never\" to\n> +\tsuppress pruning.\n\nThe same here.\n\n> gc.reflogExpire::\n> gc..reflogExpire::\n> \t'git reflog expire' removes reflog entries older than\n> -\tthis time; defaults to 90 days. With \"\" (e.g.\n> +\tthis time; defaults to 90 days. The value \"all\" expires all\n> +\tentries; and \"false\" disables expiration. With \"\" (e.g.\n> \t\"refs/stash\") in the middle the setting applies only to\n> \tthe refs that match the .\n\nSimilarly, this could be fixed to\n\n [...] The value \"all\" expires all\n entries; \"false\" disables expiration. [...]\n\n\n> @@ -1328,7 +1330,8 @@ gc.reflogExpireUnreachable::\n> gc..reflogExpireUnreachable::\n> \t'git reflog expire' removes reflog entries older than\n> \tthis time and are not reachable from the current tip;\n> -\tdefaults to 30 days. With \"\" (e.g. \"refs/stash\")\n> +\tdefaults to 30 days. The value \"all\" expires all entries; and\n> +\t\"false\" disables expiration. With \"\" (e.g. \"refs/stash\")\n> \tin the middle, the setting applies only to the refs that\n> \tmatch the .\n\nThe same here.\n\nAlso, I wonder why you suggest \"now\"/\"never\" for the first two settings,\nbut \"all\"/\"false\" for the second two. Wouldn't it be less confusing to\nbe consistent?\n\nMichael\n\n-- \nMichael Haggerty\nmhagger@alum.mit.edu\n"},{"id":"266948","messageId":"CAPig+cTbTi5Uj_BFWBQ+rDc0=PhY1pu9Emr9TwTwPzGCeE5J2A@mail.gmail.com","threadId":"39928","inReplyTo":"55B58C3B.7040200@alum.mit.edu","subject":"Re: [PATCH 2/6] Documentation/config: mention \"now\" and \"never\" for 'expire' settings","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-28T17:33:53Z","receivedAt":"2015-07-28T17:33:53Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"[+cc:Paul Tan]\n\nOn Sun, Jul 26, 2015 at 9:41 PM, Michael Haggerty wrote:\n> On 07/23/2015 09:00 PM, Eric Sunshine wrote:\n>> In addition to approxidate-style values (\"2.months.ago\", \"yesterday\"),\n>> consumers of 'gc.*expire*' configuration variables also accept and\n>> respect 'now'/'all' (\"do it immediately\") and 'never'/'false' (\"suppress\n>> entirely\").\n>>\n>> Suggested-by: Michael Haggerty \n>> Signed-off-by: Eric Sunshine \n>> ---\n>> gc.pruneExpire::\n>> When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n>> Override the grace period with this config variable. The value\n>> - \"now\" may be used to disable this grace period and always prune\n>> - unreachable objects immediately.\n>> + \"now\" may be used to disable this grace period and always prune\n>> + unreachable objects immediately; or \"never\" to suppress pruning.\n>\n> A semicolon should be used without a conjunction, and the parts of a\n> sentence joined by a semicolon should be independent clauses. So this\n> should probably be\n\nI was just getting ready to re-roll this series[1] to address\nMichael's comments[2] and noticed that the add-on patch 7/6 which I\nsent later[3] seems to have been botched when Junio applied it to\n'pu'. It's currently at 36598db (Documentation/git-tools: drop\nreferences to defunct tools, 2015-07-24) in\nes/doc-clean-outdated-tools and it appears that the --scissors option\ndidn't cut off the leading cruft from the email conversation, thus the\ncommit has the wrong \"subject\" plus a bunch of email conversation gunk\nin the commit message which doesn't belong. I understand that Junio\nuses a relatively bleeding-edge version of Git for his day-to-day work\nand was wondering if this is possible fallout from the git-am rewrite\nin C?\n\n[1]: http://thread.gmane.org/gmane.comp.version-control.git/274537\n[2]: http://article.gmane.org/gmane.comp.version-control.git/274647\n[3]: http://article.gmane.org/gmane.comp.version-control.git/274602\n"},{"id":"266963","messageId":"xmqqzj2gdt86.fsf@gitster.dls.corp.google.com","threadId":"39928","inReplyTo":"CAPig+cTbTi5Uj_BFWBQ+rDc0=PhY1pu9Emr9TwTwPzGCeE5J2A@mail.gmail.com","subject":"Re: [PATCH 2/6] Documentation/config: mention \"now\" and \"never\" for 'expire' settings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-28T18:36:57Z","receivedAt":"2015-07-28T18:36:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine writes:\n\n> I was just getting ready to re-roll this series[1] to address\n> Michael's comments[2] and noticed that the add-on patch 7/6 which I\n> sent later[3] seems to have been botched when Junio applied it to\n> 'pu'. It's currently at 36598db (Documentation/git-tools: drop\n> references to defunct tools, 2015-07-24) in\n> es/doc-clean-outdated-tools and it appears that the --scissors option\n> didn't cut off the leading cruft from the email conversation, thus the\n> commit has the wrong \"subject\" plus a bunch of email conversation gunk\n> in the commit message which doesn't belong. I understand that Junio\n> uses a relatively bleeding-edge version of Git for his day-to-day work\n> and was wondering if this is possible fallout from the git-am rewrite\n> in C?\n\nIt is more likely that I was just lazy, knowing that the patch [3]\nwould not hit \"next\" and I'll have a more relaxed time to amend it\nafter the release was done, and let \"am -s\" without \"-c\" take it.\n\nI just tried to re-apply the patch with \"am -sc\" on\nes/doc-clean-outdated-tools^ and the built-in one takes it just\nfine, so we should be OK.\n\nThanks.\n"},{"id":"266992","messageId":"CAPig+cQPj3wA8EfdNTskCUc__QXLwR07Ck4QrYvc9wnZqOxtug@mail.gmail.com","threadId":"39928","inReplyTo":"55B58C3B.7040200@alum.mit.edu","subject":"Re: [PATCH 2/6] Documentation/config: mention \"now\" and \"never\" for 'expire' settings","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-28T20:33:06Z","receivedAt":"2015-07-28T20:33:06Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Jul 26, 2015 at 9:41 PM, Michael Haggerty wrote:\n> On 07/23/2015 09:00 PM, Eric Sunshine wrote:\n>> In addition to approxidate-style values (\"2.months.ago\", \"yesterday\"),\n>> consumers of 'gc.*expire*' configuration variables also accept and\n>> respect 'now'/'all' (\"do it immediately\") and 'never'/'false' (\"suppress\n>> entirely\").\n>>\n>> Suggested-by: Michael Haggerty \n>> Signed-off-by: Eric Sunshine \n>> ---\n>> gc.pruneExpire::\n>> When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n>> Override the grace period with this config variable. The value\n>> - \"now\" may be used to disable this grace period and always prune\n>> - unreachable objects immediately.\n>> + \"now\" may be used to disable this grace period and always prune\n>> + unreachable objects immediately; or \"never\" to suppress pruning.\n>\n> A semicolon should be used without a conjunction, and the parts of a\n> sentence joined by a semicolon should be independent clauses. So this\n> should probably be\n>\n> [...] The value\n> \"now\" may be used to disable this grace period and always prune\n> unreachable objects immediately, or \"never\" may be used to\n> suppress pruning.\n\nI was absent from school that day...\n\n>> @@ -1328,7 +1330,8 @@ gc.reflogExpireUnreachable::\n>> gc..reflogExpireUnreachable::\n>> 'git reflog expire' removes reflog entries older than\n>> this time and are not reachable from the current tip;\n>> - defaults to 30 days. With \"\" (e.g. \"refs/stash\")\n>> + defaults to 30 days. The value \"all\" expires all entries; and\n>> + \"false\" disables expiration. With \"\" (e.g. \"refs/stash\")\n>> in the middle, the setting applies only to the refs that\n>> match the .\n>\n> Also, I wonder why you suggest \"now\"/\"never\" for the first two settings,\n> but \"all\"/\"false\" for the second two. Wouldn't it be less confusing to\n> be consistent?\n\nIt was intentional due to the way I worded the sentence. It sounded\nslightly strange to my ear to say:\n\n The value \"now\" expires all entries; and \"never\"\n disables expiration.\n\nwhereas:\n\n The value \"all\" expires all entries; ...\n\nsounded nice. But, upon reflection, with a slight re-wording[1], \"all\"\nand \"never\" work, as well.\n\n[1]: http://article.gmane.org/gmane.comp.version-control.git/274828\n"}]}