summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:18 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:18 -0800
commit6903f33c402ac7c38e8d9500e10889cd83df888f (patch)
tree7602bb0c880d54c85b20f39cfefcf7b281e11b75 /Documentation
parent0abfede3aefb0c23e484cf36d3109314b811f2f7 (diff)
parent3120925c25e571d4cd3b7c20608a01e35961d1a4 (diff)
downloadgit-6903f33c402ac7c38e8d9500e10889cd83df888f.tar.gz
Merge branch 'sb/remove-gitview'
Retire long unused/unmaintained gitview from the contrib/ area. * sb/remove-gitview: doc: git-gui browser does not default to HEAD doc: gitk: add the upstream repo location doc: gitk: remove gitview reference contrib: remove gitview
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-gui.txt2
-rw-r--r--Documentation/gitk.txt14
2 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index c1a3e8bf07..5f93f8003d 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -35,7 +35,7 @@ blame::
browser::
Start a tree browser showing all files in the specified
- commit (or `HEAD` by default). Files selected through the
+ commit. Files selected through the
browser are opened in the blame viewer.
citool::
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index e382dd96df..ca96c281d1 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -178,19 +178,21 @@ used by default. If '$XDG_CONFIG_HOME' is not set it defaults to
History
-------
Gitk was the first graphical repository browser. It's written in
-tcl/tk and started off in a separate repository but was later merged
-into the main Git repository.
+tcl/tk.
+'gitk' is actually maintained as an independent project, but stable
+versions are distributed as part of the Git suite for the convenience
+of end users.
+
+gitk-git/ comes from Paul Mackerras's gitk project:
+
+ git://ozlabs.org/~paulus/gitk
SEE ALSO
--------
'qgit(1)'::
A repository browser written in C++ using Qt.
-'gitview(1)'::
- A repository browser written in Python using Gtk. It's based on
- 'bzrk(1)' and distributed in the contrib area of the Git repository.
-
'tig(1)'::
A minimal repository browser and Git tool output highlighter written
in C using Ncurses.