From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2017 23:12:18 +0000 (-0800)
Subject: Merge branch 'sb/remove-gitview'
X-Git-Tag: v2.12.0-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6903f33c402ac7c38e8d9500e10889cd83df888f?ds=inline;hp=-c

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
---

6903f33c402ac7c38e8d9500e10889cd83df888f
diff --combined Documentation/gitk.txt
index e382dd96df,253efa617b..ca96c281d1
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@@ -70,7 -70,7 +70,7 @@@ linkgit:git-rev-list[1] for a complete 
  
  --left-right::
  
 -	Mark which side of a symmetric diff a commit is reachable
 +	Mark which side of a symmetric difference a commit is reachable
  	from.  Commits from the left side are prefixed with a `<`
  	symbol and those from the right with a `>` symbol.
  
@@@ -82,7 -82,7 +82,7 @@@
  
  --simplify-merges::
  
 -	Additional option to '--full-history' to remove some needless
 +	Additional option to `--full-history` to remove some needless
  	merges from the resulting history, as there are no selected
  	commits contributing to this merge.  (See "History
  	simplification" in linkgit:git-log[1] for a more detailed
@@@ -178,19 -178,21 +178,21 @@@ used by default. If '$XDG_CONFIG_HOME' 
  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.